changes for spree 2-1 (dependencies)
modieifed attribute update from object params for spree 2.1
minor
formatting
minor changes for development
Merge branch '2-2-stable' of gitlab.wemove.com:wemove/spree_payment_network into 2-2-stable

Conflicts:
	.rspec