7 commits

Author	SHA1	Message	Date
kervala	5109ae5443	Merge with develop	2016-03-19 19:30:06 +01:00
kervala	0e1cbe909c	Merge with develop	2016-03-15 12:37:11 +01:00
kervala	df7917c012	Merge with develop	2016-03-15 00:08:40 +01:00
kervala	8dfe8412ae	Merge with develop	2016-03-12 14:49:35 +01:00
kervala	5a8dd806f0	Merge with develop	2016-03-11 09:51:59 +01:00
kervala	9febb7374a	merge with develop	2016-01-28 13:27:35 +01:00
kervala	198759a880	Fixed: Use same XML files as on Atys	2016-01-24 17:08:32 +01:00