still beautification of the player section, removed JPlayer, general reorganization
Merge remote-tracking branch 'origin/master'