merge work
added file upload upsell
adjusted text and added pro button
Merge remote-tracking branch 'remotes/origin/D3375' into develop

Conflicts:
	catalog/includes/javascript/general.js.php