commit to merge
Merge branch 'master' of https://github.com/QJiePing/cs2103aug2014-w10-2j

Conflicts:
	src/taskaler/integration_test/IntegrationTest.java