properties woes
Merge branch 'mainpage-SQL' of https://github.com/utwente-di/di07 into mainpage-SQL

Conflicts:
	Ideating/target/m2e-wtp/web-resources/META-INF/maven/di07/Ideating/pom.properties