reservation controller
Merge branch 'master' into dev-alberto

Conflicts:
	app/views/shared/_header.html.erb
	config/routes.rb
	spec/factories/flights.rb
Merge branch 'master' into dev-alberto
Merge branch 'master' into dev-alberto

Conflicts:
	spec/factories/flights.rb
Reservation in backbone
Merge branch 'master' into dev-alberto

Conflicts:
	app/assets/javascripts/backbone/views/AppView.js
	app/views/pages/index.html.erb
Merge pull request #27 from MollyMoile/dev-alberto

Dev alberto