Profile feature, first step !
Merge branch 'profile-feature'

Conflicts:
	app/controllers/application_controller.rb
	db/schema.rb