Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	buildVersion/build_info.properties
	buildpaths.xml
	docroot/cleanwise/WEB-INF/struts-config.xml
	docroot/cleanwise/i18n/Message_All_en.txt
	docroot/cleanwise/i18n/Message_All_en_GB.txt
	docroot/cleanwise/userportal/esw/customerSystemPostRedirect.jsp
	espendwise.properties
	src/com/cleanwise/service/api/pipeline/SaveWebOrderRequest.java
	src/com/cleanwise/service/api/process/operations/GenericReportRunnerOperations.java
	src/com/cleanwise/service/api/process/operations/ProcessCorporateOrders.java
	src/com/cleanwise/service/api/session/CatalogInformationBean.java
	src/com/cleanwise/service/api/session/CorporateOrderBean.java
	src/com/cleanwise/service/api/util/RefCodeNames.java
	src/com/cleanwise/service/apps/FileTransferClient.java
	src/com/cleanwise/service/apps/GenerateThumbnails.java
	src/com/cleanwise/service/apps/dataexchange/InboundcXMLPunchOutLogon.java
	src/com/cleanwise/service/apps/dataexchange/OutboundPunchOutOrderCXML.java
	src/com/cleanwise/service/apps/quartz/EventJobImpl.java
	src/com/cleanwise/service/apps/quartz/EventSysJob.java
	src/com/cleanwise/service/apps/quartz/ReportEventJob.java
	src/com/cleanwise/view/i18n/CleanwiseResources.properties
	src/com/cleanwise/view/logic/CheckoutLogic.java
	src/com/cleanwise/view/logic/StoreItemMgrLogic.java
	src/com/cleanwise/view/logic/TradingPartnerMgrLogic.java
	src/com/cleanwise/view/utils/Constants.java
	src/com/espendwise/view/actions/esw/ModuleIntegrationAction.java
	src/com/espendwise/view/actions/esw/ReportingAction.java
	src/com/espendwise/view/actions/esw/SecurityAction.java
	src/com/espendwise/view/actions/esw/ShoppingAction.java
	src/com/espendwise/view/logic/esw/ShoppingLogic.java
	storeCustomization/customstorepages/NewXpedx/t_custAcctMgtReportLocDateSelect.jsp
	storeCustomization/customstorepages/xpedx/orderline/selectsupplies/t_logOnBody.jsp
	storeCustomization/customstorepages/xpedx/orderline/t_logOnBody.jsp
	storeCustomization/esw/baselinestorepages/contentReportingShowStandardReportFilter.jsp
	storeCustomization/esw/baselinestorepages/header.jsp
	storeCustomization/esw/baselinestorepages/shoppingTabs.jsp
	tools/gencode/build.xml
	tools/jobs/xsuite-daily-generic-reports.xml
	tools/jobs/xsuite-end-of-week-reports.xml
	tools/jobs/xsuite-short-pay-reports.xml
	tools/oboe.new/xml/IDList355.xml

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@3 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c
Merge pull request #4 from depingling/master

Update related to automation of corporate order process and Kohl's par l...

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@4 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c
Sql script to related to punchout and corporate order process automation

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@5 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c
Remove one extra character '"'

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@6 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c
EB-7116 - Remove Delivery Schedule report since no customer need it

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@7 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c
Fixing related to change internal email from xpedx.com, ipaper.com to veritivcorp.com

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@8 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c
Change Contract name column size from 30 to 50

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@9 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c
Merge branch 'master' of veritivgit:Veritiv/stjohn

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@10 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c