TRUNK-4287: Latest Order class merged
TRUNK-4287: order_type field added to Order.hbm.xml
TRUNK-4287: Latest branch merged