Fixes rspec version
Fixes broken invoice extension tests
Fixes broken invoice extension tests
Fixes merge conflict in Gemfile
Merge commit '6d980da2fe0a3e7423ca590109f3586098365614'

Conflicts:
	spec/extensions/invoice_extension_spec.rb