hotel now with updating
updating ember to RC3
Merge branch 'e_01' into e_02

Conflicts:
	Gemfile
Merge branch 'e_02' into e_03
Merge branch 'e_03' into e_04

Conflicts:
	Gemfile.lock
Merge branch 'e_04' into e_04a
now with _working_ tests
code marker
test refactoring
passing test for sorting
another marker
fix
missing semicolon
trying nested routes
almost there
Merge branch 'e_04a' into e_05

Conflicts:
	Gemfile
	app/assets/javascripts/controllers/trips_controller.js
	app/assets/javascripts/routes/app_router.js
	app/assets/javascripts/templates/trips.handlebars
one more fix