Merge branch 'cleancontroller'

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_student.html.erb