Merge origin/master

Conflicts:
	java/src/clubmanager/Main.java