Merge pull request #145 from cs2103aug2014-t16-3j/develop

Develop
Merge pull request #152 from cs2103aug2014-t16-3j/develop

Develop (v0.3)
Merge pull request #153 from cs2103aug2014-t16-3j/master

merge back from master