Commit Message

Commit
Merge branch 'master' of https://github.com/VelvetMastermind/Rostr

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