Reserving the order_id so that it will remain the same through out the transaction.
Merge branch 'dev'
Update version number for order number