Change avatar Fields
Merge
Merge branch 'master' of https://github.com/ggueno/projecteel

Conflicts:
	fixtures/initial_data.json
Clean-up views