shopping cart
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/php/Messages.class.php
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
mail confirmation is working