Merge branch 'origin/ash'
init commit - admin functions portal implementation
Merge branch 'origin/jon'
updated views