Merge branch 'hotfix/fixBackoffice'
Player with sub
Merge branch 'hotfix/playerWithSub' into develop

Conflicts:
	jwplayer.php