Merge pull request #2166 from pjackson28/master

Fixed the issue with vidoes in separate mobile view tabs (#1861) and merging in other fixes
Removed remaining merge conflicts.
Merge branch 'master' of https://github.com/wet-boew/wet-boew