no message
Merge branch 'master' of https://github.com/admund/MVM_project

Conflicts:
	MVM_Servlet/src/pl/admund/MVM_Servlet/Player/Player.java