Updated layouts and views
Merge branch '9_add_new_bootstrap_template'

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