datastore
Merge branch 'master' of https://github.com/abarhub/dvdlist

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