Develop
Merge all updates including transfer of OroCommerce orderid into master. I'm not quite sure about your merging stategy, but I think master should contain latest code changes.
For future development it would be useful to create branches for supported OroCommerce version. Current development is against version 3.1.x of OroCommerce.