user profile done with avatar
Merge branch 'master' into profile

Conflicts:
	config/locales/en.active_record.yml
	config/locales/en.yml
	config/locales/es.active_record.yml
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
Small style refactor
Removed some links and views
Merge pull request #12 from ITBA/profile

user profile done with avatar