Install device, add a user and install views
Merge branch 'master' of github.com:edxrails/treebook

Conflicts:
	Gemfile
	app/models/user.rb
	app/views/devise/sessions/new.html.erb
	db/development.sqlite3
	log/development.log