edit marketer
commit
updated edit
updated edit profile
Merge branch 'ash' into jon

Conflicts:
	SODAMvcApplication/SODAPortalMvcApplication/Controllers/AdminController.cs