fix for template specific js file include
Merge remote-tracking branch 'remotes/origin/B2598' into develop

Conflicts:
	catalog/templates/core/javascript/general.js.php