Merge remote-tracking branch 'angela/web' into web

Conflicts:
	database/urbangame.h2.db
	target/scala-2.10/resource_managed/main/public/javascripts/controllers/myGamesCtrl.js
	target/scala-2.10/resource_managed/main/public/javascripts/controllers/myGamesCtrl.min.js
	target/scala-2.10/resource_managed/main/public/javascripts/main.min.js
Merge branch 'web' of github.com:wojciechSlodziak/UrbanGame into web