4 commits

Author	SHA1	Message	Date
kervala	ad98793560	Merge with develop	2016-06-19 21:10:23 +02:00
kervala	6fbf8c5326	Merge with develop	2016-05-26 19:36:25 +02:00
kervala	9a61bd9a7c	Merge with develop	2016-05-16 16:31:30 +02:00
kervala	b85c2753a8	Merge with develop	2016-05-16 11:13:45 +02:00