Merge branch 'master' of https://github.com/numinix/fec

Conflicts:

catalog/includes/templates/YOUR_TEMPLATE/templates/tpl_checkout_stacked.
php
Product breaking checkout

Product Min and Units MAX to your cart and get to this step you will
see the html breaks