change way expiry date is handled with payment service
Merge branch 'master' of https://github.com/mathswan/cie-prototype