Merge pull request #10 from depingling/master

EB-7587 Added 'Estimated In-Stock' date and cancelled items for backorde...

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