Updates to controller.
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013

Conflicts:
	Controller/src/controller/Controller.java