update modification
Merge branch 'master' of github.com:nurinamu/multi_galaga

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