Improve Task Table
clean up web.xml
Task Table bug fix
Merge branch 'master' of https://github.com/anbangx/salesforce-hackathon

Conflicts:
	src/main/java/core/Scheduler.java
	src/main/java/datamodel/Task.java