Merge origin/master

Conflicts:
	Bitme/src/java/info/toegepaste/service/ScoreService.java