hh
Merge branch 'rootdev' of https://github.com/nosfik/proj01 into rootdev

Conflicts:
	catalog/model/checkout/order.php