list/cancel Host spots: OK
For viewspot.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestAppEngineProject/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	TestAppEngineProject/war/WEB-INF/classes/.gitignore
	TestAppEngineProject/war/WEB-INF/web.xml
	TestAppEngineProject/war/javascripts/main.js
	TestAppEngineProject/war/viewspots.jsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	TestAppEngineProject/war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	TestAppEngineProject/war/viewspots.jsp