Reservation list
For viewspot.jsp
Merge remote-tracking branch 'origin/master'

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