jPlayer improvements and fixes for displaying dynamic albums and search results.
canonical functions
prep for merge
Merge remote-tracking branch 'upstream/master' into upstream

Conflicts:
	zp-core/zp-extensions/jplayer.php
Merge pull request #160 from sbillard/master

upstream