Commit bootstrap & routes
devise signout_added
Merge branch 'alex' into alexnew

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb
Merge branch 'alex' into alexnew

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/application.html.erb
before cancan role - project clean
Test variant - change models - base - devise - cancan  - variant 1