Add backbone structure.
Merge branch 'master' into add_backbone

Conflicts:
	Gemfile
	Gemfile.lock
move bootstrap files to vendors folder
render companies with backbone
added backbone player functionality
Merge branch 'add_backbone' of https://github.com/Moove-it/deathmatch into add_backbone

Conflicts:
	app/assets/javascripts/deathmatch.js.coffee
Merge branch 'master' of personal_github:Moove-it/deathmatch into add_backbone

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
Merge styles and markup in add backbone.
Merge branch 'master' of personal_github:Moove-it/deathmatch into add_backbone

Conflicts:
	Gemfile
	Gemfile.lock
added current match backbone model
Merge branch 'master' of personal_github:Moove-it/deathmatch into add_backbone
Merge branch 'add_backbone' of https://github.com/Moove-it/deathmatch into add_backbone

Conflicts:
	app/assets/stylesheets/application.css
	app/controllers/matches_controller.rb
	config/routes.rb
Add player wait list.
Merge branch 'add_backbone' of personal_github:Moove-it/deathmatch into add_backbone
Merge branch 'master' into add_backbone

Conflicts:
	Gemfile
	Gemfile.lock
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 'master' into add_backbone

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

Conflicts:
	app/models/match.rb
fixes for current_match backbone view