EB-6479: Changed URL for the blog icon.
EB-6722: Removed International Paper and updated with "© 2014. All Rights Reserved."
EB-7013: Remove "Edit" from the MIL non-edit  title.
EB:6971- Changes for the watermark bug
EB-6958. fixed order multiple variable name.
EB-6300 check-in missing sub flow entry after merge
EB-6613 - Checked-in for List Desc to be 250
Merge branch 'v2.0.14.04' of http://s29exvm05.na.ipaper.com:8080/gitblit/git/xcomv2 into v2.0.14.04
EB-7013: Fixed printer position on Non-edit MIL page.
EB-6913- Code Clean up
EB-309 performance fix for user profile page
EB-7027 : Fixed the issue of single quote in either line cust Acct# or po# in catalog page.
EB-6971: Code cleanup and error fixes for IE8
Merge remote-tracking branch 'upstream/rc_temp' into hardening_r15

Conflicts:
	src/WebChannel/main/java/com/sterlingcommerce/xpedx/webchannel/profile/org/DynamicQueryAction.java
	src/WebChannel/main/webapp/xpedx/jsp/common/XPEDXPrepareHeader.jsp
Merge remote-tracking branch 'origin/prodsupport' into hardening_r15

Conflicts:
	src/WebChannel/main/java/com/sterlingcommerce/xpedx/webchannel/common/XPEDXBreadcrumbDisplayComponent.java (kept prodsupport version plus some manual changes)
	src/WebChannel/main/webapp/xpedx/jsp/common/XPEDXPrepareHeader.jsp (kept hardening version)
previous commit should have had this correction to commenting out 'console.log'
Merge remote-tracking branch 'upstream/hardening_r15' into hardening_r15

Conflicts:
	src/WebChannel/main/java/com/sterlingcommerce/xpedx/webchannel/common/XPEDXBreadcrumbDisplayComponent.java
	src/WebChannel/main/webapp/xpedx/jsp/common/XPEDXPrepareHeader.jsp
EB-6722: Replaced "International Paper" on salespro login page.
Merge remote-tracking branch 'upstream/hardening_r15' into hardening_r15
EB-6981 - P1 fix for JDBC connection leak