plop
Merge remote-tracking branch 'origin/master'

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