9 commits

Author	SHA1	Message	Date
kervala	0c2cdd108e	Merge with develop	2016-05-17 20:50:14 +02:00
kervala	0766c4766f	Merge with develop	2016-05-17 11:02:02 +02:00
kervala	3b4b071839	Merge with develop	2016-05-16 20:33:43 +02:00
kervala	00e99132c7	Merge with develop	2016-05-16 18:20:14 +02:00
kervala	16ce9a7964	Merge with develop	2016-05-16 18:17:40 +02:00
kervala	cd89e4c348	Merge with develop	2016-05-16 16:50:11 +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
kervala	294bf10666	Merge with develop	2016-05-14 18:55:54 +02:00