issue 4803: merge code with production
Merge branch 'master' of https://github.com/pchuanvn/myorder

Conflicts:
	Clases/Sistema/clase.order.php