updated source with the updated branch
remove external java json lib
add joda-time to maven
add description test
Merge branch 'master' into sun-taskclass
add more tests to Task
Merge branch 'sun-taskclass' of github.com:cs2103aug2014-w14-2j/main into sun-taskclass

Conflicts:
	test/application/TaskTest.java