changes
aa
updates
Merge branch 'master' of https://github.com/rivabu/CitoTester

Conflicts:
	CitoAdmin/TODO.txt
	CitoAdmin/app/index.html
	CitoAdmin/app/js/admin/controllers/werkwoorden-controller.js
	CitoAdmin/app/js/app/controllers/directStartenController.js
	CitoAdmin/app/js/app/controllers/mainController.js
	CitoAdmin/app/js/app/controllers/oefenWerkwoordenController.js
	CitoAdmin/app/js/app/controllers/selectCategorieController.js
	CitoAdmin/app/js/app/controllers/spellingController.js
	CitoAdmin/app/js/kitz-at-work-admin-app.js
	CitoAdmin/app/js/kitz-at-work-app.js
	CitoAdmin/app/js/services/kitz-at-work-services.js
	CitoAdmin/app/partials/admin/nav.html
	CitoAdmin/app/partials/admin/overtypen-detail.html
	CitoAdmin/app/partials/admin/overtypen-list.html
	CitoAdmin/app/partials/app/directStarten.html
	CitoAdmin/app/partials/app/onequestion.html
	CitoAdmin/app/partials/app/selectCategory.html
	CitoAdmin/app/partials/app/settings.html
	CitoAdmin/app/partials/app/sidebar.html
	CitoAdmin/app/partials/app/werkwoordform.html
	CitoAdmin/scripts/realserver.js
updates