5 commits

Author	SHA1	Message	Date
kervala	1e733fec01	Merge with develop	2016-09-21 15:52:53 +02:00
kervala	feac1ffdb4	Merge with develop	2016-09-21 09:57:47 +02:00
kervala	61a3bc0c9a	Merge with develop	2016-09-20 17:51:27 +02:00
kervala	16598659b5	Merge with develop	2016-09-16 19:00:32 +02:00
kervala	8af64c9e71	Merge with develop	2016-08-06 20:12:39 +02:00