Syntax changes
Merge branch 'master' of https://github.com/cs2103aug2014-w09-1j/main

Conflicts:
	src/mytasks/logic/LogicTest.java
Refactored parser code to improve visibility