7 commits

Author	SHA1	Message	Date
kervala	4438ab108c	Merge with develop	2016-11-07 14:12:11 +01:00
kervala	0cfd8cb35d	Merge with develop	2016-10-27 16:48:45 +02:00
kervala	627dea4a06	Merge with develop	2016-10-23 16:29:49 +02:00
kervala	14917f114f	Merge with develop	2016-10-22 16:55:51 +02:00
kervala	c3bcfb42b8	Merge with develop	2016-10-20 13:08:48 +02:00
kervala	e1555f9e24	Merge with develop	2016-09-24 15:54:47 +02:00
kervala	4c51c4e68c	Merge with develop	2016-09-24 14:22:22 +02:00