no major changes
Added popout code to webView, added scratchpad and masking assets
Merge branch 'ross'