update
Merge branch 'master' of https://github.com/tsuxia/LetUs.git

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