WIP
Some changes
Merge branch 'a' into money-fixes-for-coupon-and-fixtures

Conflicts:
	src/Elcodi/CartBundle/Resources/config/doctrine/CartLine.orm.yml