Updated views with bootplus layout
Merge branch '18_add_bootplus_to_rails'

Conflicts:
	app/views/users/show.html.erb