Diagrams for Model.
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into staging
Use sorting style enum from TaskController instead of creating a separate one in TitleBarViewManager
Merge branch 'staging' of github.com:cs2103aug2014-w13-1c/main into jin/gui
Merge pull request #259 from cs2103aug2014-w13-1c/jin/gui

DRY sorting style enum and remove magic numbers
Halfway doing the commenting

Finished commenting on CommanController
Just started on ActionController
Merge pull request #260 from cs2103aug2014-w13-1c/ryan/controller

Halfway doing the commenting
Got ActionControllerUnits to work.
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into staging
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