Fixed error messages & rearranged ActionController
Merge branch 'staging' into ryan/controller
Merge pull request #271 from cs2103aug2014-w13-1c/ryan/controller

Fixed error messages & rearranged ActionController