checking Deping change for login issue

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@20 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c
EB-7895 Repace order id with web order number in error message
EB-7893 Use generic user id for punchout login if user id not found in system.
EB-7587 - Restored the changed that overrides by previous version
Merge branch 'master' of veritivgit:Veritiv/stjohn
EB-7587
EB-7895 Repace order id with web order number in error message

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@21 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c
EB-7893 Use generic user id for punchout login if user id not found in system.

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@22 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c
EB-7587 - Restored the changed that overrides by previous version

git-svn-id: svn+ssh://10.208.165.230/var/svn/stjohn/trunk@23 cb34496e-5fd4-4bb1-8cc7-e455c5ced60c
Merge branch 'master' of veritivgit:Veritiv/stjohn
EB-8090 Make url can be accessed internally and externally
EB-8087 Updated punchout shopping related to 'End Shopping' function
EB-8087 Punchout 'End Shopping' function update
EB-8090 Add some logging information for debugging purpose
Merge branch 'master' of https://github.com/depingling/stjohn into dling-master

Conflicts:
	src/com/cleanwise/view/actions/ActionSuper.java
Merge branch 'dling-master'