Typo categorie
Merge branch 'master' of https://github.com/utwente-di/di07

Conflicts:
	Ideating/src/main/java/database/SQLMaker.java
	Ideating/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF