9 commits

Author	SHA1	Message	Date
ruben-	f043b7d613	merge with branch01 + version update	2017-02-22 21:39:22 +01:00
ruben-	a3c6318cce	sync with branch01 + refactoring	2017-01-14 13:16:52 +01:00
ruben-	aaf70d27af	sync with branch01	2016-11-24 20:46:47 +01:00
ruben-	91af385a04	merge with branch01 + php fixes	2016-10-24 20:33:37 +02:00
ruben-	c232857821	Merge with branch01	2016-04-27 21:54:28 +02:00
ruben-	7f5448790c	Merge with branch1 + version update	2016-03-03 20:28:07 +01:00
ruben-	12ad33e7eb	Sync branch01 + translation fixes	2016-02-15 22:08:39 +01:00
ruben-	f942c94b3d	merge with branch01	2015-12-05 17:38:52 +01:00
Luke Carbis	911adc5bb9	code cleanup	2015-10-15 22:52:37 +10:00