Merge origin/master

Conflicts:
	Bitme/src/java/info/toegepaste/controller/uploadController.java