upupup gogogogo
Merged revision
Merge origin/master

Conflicts:
	src/java/controller/MainController.java