Merge branch 'merge-upstream' into gh-pages
Merge branch 'master' of https://github.com/TheWolfA2/thisis183 into gh-pages
Fixing the "fix" to popovers in mobile