FrontEnd: Completing the jPlayer 2.2 -> 2.5 upgrade
Merge branch 'master' of github.com:xionic/Toboggan