ready to merge
Merge branch 'profile' into registration
registration ready
Merge branch 'profile' of https://github.com/Reyko/endsvchack into profile

Conflicts:
	app/controllers/users_controller.rb
	config/routes.rb
	db/schema.rb
css changes