MERGING Mark Guinnn\'s work: upgrading to SS3. THANK YOU MARK

git-svn-id: https://silverstripe-ecommerce.googlecode.com/svn/modules/ecommerce_complex_pricing/trunk@4668 950b781c-c544-efab-2f99-90083ee69683