Design and page minor changes
Teacher pages
Merge branch 'morepages'
Merge commit
Merge branch 'master' into notes

Conflicts:
	app/assets/stylesheets/application.css
	app/views/subjects_groups/index.html.erb
	config/routes.rb
	db/schema.rb