Merge remote-tracking branch 'remotes/origin/review' into master-updated

Conflicts:
	app/controllers/GameController.php
	app/routes.php
	app/views/game/show.blade.php
	public/images/add.png
	public/images/remove.png