test1
Merge remote-tracking branch 'origin/master'

Conflicts:
	KookHet/app/src/main/java/be/howest/nmct/android/kookhet/CategorieenFragment.java