Test Json response
Test put
Merge branch 'master' of github.com:anbangx/salesforce-hackathon

Conflicts:
	src/main/webapp/scheduled.jsp