Merge branch 'master' of personal_github:Moove-it/deathmatch into add_backbone

Conflicts:
	Gemfile
	Gemfile.lock
add sidekiq and twitter wip2
Merge branch 'master' of personal_github:Moove-it/deathmatch into add_backbone
Add player wait list.
Merge branch 'add_backbone' of personal_github:Moove-it/deathmatch into add_backbone
Player wait list js.
Merge branch 'add_backbone' of personal_github:Moove-it/deathmatch into add_backbone

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/match.rb
Merge branch 'add_backbone' of personal_github:Moove-it/deathmatch into add_backbone

Conflicts:
	app/models/match.rb
Change translation
add sidekiq and twitter wip3
Merge branch 'master' into sidekiq_twitter

Conflicts:
	app/models/player.rb
	app/workers/twitter_woker.rb
tweaks for sending twits [WIP]
Wait list players functionality.
Merge branch 'add_backbone' of personal_github:Moove-it/deathmatch into add_backbone
Merge branch 'master' of personal_github:Moove-it/deathmatch into add_backbone

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/match.rb
	app/models/player.rb
	app/views/dashboards/index.html.haml