smaller fixes on user load
restoring join game list
small join game fixes
Merge branch 'server'

Conflicts:
	server/app/models/game.rb