MVC in place
Merge origin/master

Conflicts:
	src/java/controller/Controller.java