avatar uploadable
css conflict resolved
Merge branch 'views2' into development

Conflicts:
	app/assets/stylesheets/application.css