4 commits

Author	SHA1	Message	Date
kervala	a4b3c7c01c	Merge with develop	2016-10-08 14:15:15 +02:00
kervala	f983a551a2	Merge with develop	2016-09-29 17:08:03 +02:00
kervala	6744ded402	Merge with develop	2016-09-28 23:55:21 +02:00
kervala	4c51c4e68c	Merge with develop	2016-09-24 14:22:22 +02:00