Commit
Merge branch 'master' of https://github.com/utwente-di/di11

Conflicts:

	ConcordiaVoortgang/Concordia/src/main/java/nl/concordia/kunstmenu/DatabaseHelper.java