10 commits

Author	SHA1	Message	Date
ruben-	591bc7822f	merging + version update	2017-01-18 22:33:53 +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-	7f5448790c	Merge with branch1 + version update	2016-03-03 20:28:07 +01:00
ruben-	1fee2ba8a1	Fix for custom themes	2016-03-03 19:49:09 +01:00
ruben-	12ad33e7eb	Sync branch01 + translation fixes	2016-02-15 22:08:39 +01:00
ruben-	e182da8e01	Merge with branch01 + update version/readme	2016-01-18 19:40:51 +01:00
ruben-	d08b09b870	merge + new version	2016-01-06 20:44:23 +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