add checkbox column
Merge branch 'master' of https://github.com/cs2103aug2014-t17-2J/main

Conflicts:
	WeDo/LogFile.txt
	WeDo/src/logic/utility/Task.java
	WeDo/src/userInterface/UserIntSwing.java