profile update
another update
Merge branch 'develop' of https://github.com/dyachoksa/django-cropping-sample into develop

Conflicts:
	avatar/avatar/templates/profile.html