Context based visibiity
Merge branch 'develop' of github.com:open-steam/webarena into develop