editOrder added
odred_item_id field added
Merge branch 'Versales-master'

Conflicts:
	multiship/objects/order.php