Merged with local changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml
	war/WEB-INF/questionendpoint-v1.api
	war/WEB-INF/questionsetendpoint-v1.api
	war/WEB-INF/responseendpoint-v1.api
	war/WEB-INF/userendpoint-v1.api