Merged with Maciej
Merge branch 'web' of https://github.com/angieo/UrbanGame into web