URBNG-68 Merged with blstream.origin
Merge branch 'web' of https://github.com/angieo/UrbanGame into web

Conflicts:
	database/urbangame.h2.db
	database/urbangame.trace.db