modify spree version
add spree_shipstation gem
add spree_hub_connector gem
resolve conflicts after test into master