-
Merge branch 'master' of https://github.com/Team38/Sopra.git

Conflicts:
	ModulManagementSystem/war/WEB-INF/classes/de/mms/client/MainPage.class