7 commits

Author	SHA1	Message	Date
kervala	f81a367111	Merge with develop	2016-07-25 18:58:02 +02:00
kervala	294bf10666	Merge with develop	2016-05-14 18:55:54 +02:00
kervala	9bb4273fe1	Merge with develop	2016-05-08 14:00:40 +02:00
kervala	dc52b3e24f	Merge with develop	2016-03-19 16:21:46 +01:00
kervala	1399b4d9d5	Merge with develop	2016-02-11 21:06:28 +01:00
kervala	f7046f21b1	Merge with develop	2016-02-08 14:37:34 +01:00
kervala	198759a880	Fixed: Use same XML files as on Atys	2016-01-24 17:08:32 +01:00