Merge branch 'master' of https://github.com/cs2103aug2014-w10-3j/main into unitTest/victor

Conflicts:
	sg/codengineers/ldo/parser/ResultImpl.java
Merge branch 'master' of https://github.com/cs2103aug2014-w10-3j/main