Merge branch 'master' into gh-pages
fixed bug with overlay and logged in states
Merge branch 'gh-pages'