some work I did??
Merge remote-tracking branch 'origin/master' into mistake2

Conflicts:
	engines/demo/app/assets/javascripts/demo/app/games/gamesService.js
	engines/demo/app/assets/javascripts/demo/app/user/accountService.js
	engines/demo/app/views/demo/main/index.html.slim
	engines/demo/app/views/demo/main/pages/games/_new.html.slim
	engines/games/app/models/games/game.rb
Hack implementation of shared data object (two many http requests)
simplify
Inline and make it slightly nicer..
Small refactor and tidy..