Change my two lines, I change your two lines
Merge pull request #261 from cs2103aug2014-w13-1c/ryan/controller

Fixed bug on update (remove end date) and halfway doing the commenting
Merge branch 'staging' into ryan/controller