Added voucher support
Merge branch 'develop' of github.com:oSoc14/mv_geomarketing into develop