4 commits

Author	SHA1	Message	Date
kervala	0cfd8cb35d	Merge with develop	2016-10-27 16:48:45 +02:00
kervala	d078103453	Merge with develop	2016-10-21 16:50:04 +02:00
kervala	52678ea899	Merge with develop	2016-10-20 13:55:34 +02:00
kervala	4c51c4e68c	Merge with develop	2016-09-24 14:22:22 +02:00