Merge branch 'master' of heroku.com:nameless-fortress-1389

Conflicts:
app/controllers/game_users_controller.rb
app/views/game_users/index.html.erb
app/views/game_users/show.json.jbuilder
db/schema.rb