MAJOR REFACTOR: moved files around
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui

Conflicts:
	src/app/Main.java
	src/app/controllers/CommandController.java
	src/tests/units/ActionControllerUnits.java