Merge branch 'origin/jon'
updated views
Merge branch 'origin/ash'