Merge branch 'master' of github:nurelm/shopify_integration

Conflicts:
	lib/shopify_api.rb
Merge branch 'master' into develop

Conflicts:
	lib/shopify_api.rb