ok2
	modified:   com/ecommerce/css/payment.css
	modified:   com/ecommerce/css/summary.css
	modified:   com/ecommerce/lang/en.php
	modified:   com/ecommerce/lang/it.php
Merge branch 'master' of https://github.com/maury91/alexxia

Conflicts:
	com/ecommerce/lang/en.php

	modified:   com/ecommerce/lang/en.php