Fixed bug on keyword detection
Merge branch 'staging' into ryan/controller
Merge pull request #273 from cs2103aug2014-w13-1c/ryan/controller

Fixed bug on keyword detection
Start and end should work now.
Merge pull request #274 from cs2103aug2014-w13-1c/jin/gui

Jin/gui
Revert ignoring idea files