devise and bootstrap adjustment
Merge remote-tracking branch 'origin/master'

Conflicts:
	BookPlus/app/assets/stylesheets/application.css
	BookPlus/app/views/layouts/_navigation.html.erb
	BookPlus/app/views/layouts/application.html.erb
	BookPlus/config/routes.rb