Merge remote-tracking branch 'origin/master'

Conflicts:
	SaTWo/app.js
	SaTWo/public/javascripts/room_page.js

+ Game code
game code
Codi de game_room