Update MediaElement code
Revert "Update MediaElement code"

This reverts commit f744e85da5038f204d3fa65ee56686ff1f53af52.
Simplify media code
Add navigation collapse javascript
Add sizing functions
Fix collapse script
Merge branch 'feature/merge-prototype' into develop