Added ability to switch between viewing text and viewing images
Merge branch 'master' into rollback