4 commits

Author	SHA1	Message	Date
kervala	c3bcfb42b8	Merge with develop	2016-10-20 13:08:48 +02:00
kervala	e5d8439a1d	Merge with develop	2016-10-18 17:50:19 +02:00
kervala	54c7e89e05	Merge with develop	2016-10-18 17:47:19 +02:00
kervala	4c51c4e68c	Merge with develop	2016-09-24 14:22:22 +02:00