wip - avatar to profile edit page
Merge branch 'master' of github.com:databrary/databrary

Conflicts:
	app/assets/form/partyEditProfileForm.js