the world is going to end!
Merge branch 'master' of https://github.com/Stormram/iDP-app

Conflicts:
	Toeschouwer App/src/com/example/idpproject/ChangeDashboard.java
	Toeschouwer App/src/com/example/idpproject/MainActivity.java
	Toeschouwer App/src/com/example/idpproject/TabCreated.java
	Toeschouwer App/src/controlls/ClickHandler.java