eb-7237: converted search form to use html5 placeholder text and a separate go button

the search input no longer uses the watermark plugin
EB-6723: new cXML punchout map for Disney
eb-7237: go button css tweaked per Glenna
EB-4535: added stock check option
EB-6936: Adjustments to Shopping cart page
eb-6895: fixed salespro page to use username in api call (formerly guest_xpedx)
Merge remote-tracking branch 'origin/prodsupport' into hardening_r15
Merge remote-tracking branch 'origin/hardening_r15' into development

Conflicts:
	src/WebChannel/main/webapp/Saalfeld/css/sfskin-Saalfeld.css (kept both)
	src/WebChannel/main/webapp/xpedx/css/global/global-2014.css (kept both)
	src/WebChannel/main/webapp/xpedx/css/sfskin-xpedx.css (kept both)