Lots of stuff

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

Conflicts:
	src/com/velvetmastermind/rostr/ServeImage.java
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml