More tests for ActionControllerUnits.
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into staging
Solve merge conflict