8 commits

Author	SHA1	Message	Date
ruben-	a3c6318cce	sync with branch01 + refactoring	2017-01-14 13:16:52 +01:00
ruben-	2e89454786	merge branch01 + fix invalid security fix for admin user	2016-12-29 22:19:20 +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-	67dbdb0420	merge with branch01 + update version	2015-12-07 19:49:58 +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