alt
Merge commit '54cc927d12720d6fda1782a5a07e014080951a7b'

Conflicts:
	mms/src/controller/DbController.java
Merge branch 'master' of https://github.com/ex-studios/mms.git

Conflicts:
	mms/build/classes/controller/DbController.class
	mms/build/classes/model/User.class
	mms/build/classes/model/content/Event.class
	mms/build/classes/model/content/Module.class
	mms/build/classes/model/content/ModuleHandbook.class