hiding payment and shipment history until a payment or shipment exists
resolved merge conflict
Merge pull request #653 from bowserm/1.2.0_orders

hiding payment and shipment history until a payment or shipment exists
Fixed the localization for the shippingmethod dialog
Merge remote-tracking branch 'merchello/1.2.0' into 1.2.0
Merge pull request #657 from koswesley/Localization

Localization
Merge remote-tracking branch 'merchello/1.2.0' into 1.2.0