Merge branch 'origin/jon'
Merge branch 'jon' c/o ash
Merge branch 'origin/master'
IMPORTANT: adminmenu view
added new views for marketer
IMPORTANT!marketer views
IMORTANT: updated create and edit views of marketer
IIMPORTANT! updated marketers view
Imp: layout
IMP: layout portal
IMP: add edit marketer
IMP: update titles
csproj remove
Merge branch 'origin/ash'

Conflicts:
	SODAMvcApplication/SODAPortalMvcApplication/SODAPortalMvcApplication.csproj