Merge origin/master

Conflicts:
	java/nbproject/project.properties
	java/src/clubmanager/ServerConfig.java