Updating JPlayer to 2.2.0, also adding refresh button to the admin view server log tab
Merge remote branch 'origin/master'