edit media different image on update
Merge branch 'master' into sno_branch_updates

Conflicts:
	tendenci/apps/profiles/templates/profiles/search-result.html
fixed width height management
fixed width height management
Merge branch 'master' into sno_branch_updates
#1340 - Match field types on "Edit membership" backend to those on Membership Application | SNO
#1340 update
#1340 added update on initialization of UD field
Merge branch 'master' into sno_branch_updates
#1340 added updates on form initialization on the admin for the membership form
Merge branch 'master' into sno_branch_updates
ScreenShot for Jordy Template

ScreenShot for Jordy Template
Merge branch 'master' into sno_branch_updates
added updates to match user define fields on admin
merge with sno_branch_updates