Merge origin/master

Conflicts:
	software/con4/src/logic/Controller.java