Merge branch 'origin/master'
delete proj to upload ash (reverted from commit d48af024290f0b5a6cf9421c4ce1fa43aea14e1c)
Merge branch 'jon'
committed - important for portal
editHome fix pagecode
Merge branch 'origin/master'
Merge branch 'origin/ash'

Conflicts:
	CMSMvcApplication/CMSMvcApplication/Views/pages/edithome.cshtml
Merge branch 'jon'
Merge branch 'master'
fix reltable init
Merge branch 'origin/ash'
Merge branch 'jon'
Updated DS
Update DB
Merge branch 'origin/jon'
Merge branch 'origin/master'
add sales code views - important
edit sales code - important
add sales code view - important