Merge branch 'origin/jon'
updated views not yet done
not yet done
Merge branch 'origin/jon'

Conflicts:
	SODAMvcApplication/SODAPortalMvcApplication/Controllers/AdminController.cs
views admin : important
important
Merge branch 'origin/ash'