4 commits

Author	SHA1	Message	Date
kervala	a388c89fd5	Merge with develop	2016-10-19 10:50:26 +02:00
kervala	98a2f3740c	Merge with develop	2016-10-17 13:14:20 +02:00
kervala	8a52b34e09	Merge with develop	2016-10-17 11:49:38 +02:00
kervala	4c51c4e68c	Merge with develop	2016-09-24 14:22:22 +02:00