Category class toegevoegd
Merge branch 'Dennis' into Renier

Conflicts:
	Common/AndroidManifest.xml
	Common/bin/AndroidManifest.xml
	Common/bin/Common.apk
	Common/bin/classes.dex
	Common/bin/classes/com/example/common/Bedrijven$1.class
	Common/bin/classes/com/example/common/Bedrijven.class
	Common/bin/classes/com/example/common/Kalender$1.class
	Common/bin/classes/com/example/common/Kalender.class
	Common/bin/classes/com/example/common/MainActivity$1.class
	Common/bin/classes/com/example/common/MainActivity$2.class
	Common/bin/classes/com/example/common/MainActivity$3.class
	Common/bin/classes/com/example/common/MainActivity$4.class
	Common/bin/classes/com/example/common/MainActivity$5.class
	Common/bin/classes/com/example/common/MainActivity.class
	Common/bin/classes/com/example/common/R$drawable.class
	Common/bin/classes/com/example/common/R$id.class
	Common/bin/classes/com/example/common/R$layout.class
	Common/bin/classes/com/example/common/R$menu.class
	Common/bin/classes/com/example/common/R$string.class
	Common/bin/classes/com/example/common/R$style.class
	Common/bin/classes/com/example/common/SplashActivity.class
	Common/bin/resources.ap_
	Common/gen/com/example/common/R.java