Merge branch 'origin/master'
add sales code views - important
edit sales code - important
add sales code view - important
Merge branch 'origin/ash'
init commit - admin functions portal implementation
Merge branch 'origin/jon'
added CMS url logic
updated views
Merge branch 'origin/jon'
Merge branch 'origin/ash'
added region
updated views not yet done
not yet done
Merge branch 'origin/jon'

Conflicts:
	SODAMvcApplication/SODAPortalMvcApplication/Controllers/AdminController.cs
views admin : important
important
updated db
sales controller
misc commits