clear
Catalog tests
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Authorize.net updated.
AuthorizeNet plugin.
Updated tests
Merge branch '1.3.0' of https://github.com/rustyswayne/Merchello into 1.3.0

Conflicts:
	test/Merchello.Tests.IntegrationTests/App.config
updated Merchello dev version to 1.2.14
Merge pull request #761 from rustyswayne/1.3.0

Updates Merchello dev version to 1.2.14
Stripe payment provider
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
#M-321 Fixed
Updated CatalogInventoryDisplay model to reflect Core changes.
Merge pull request #763 from rustyswayne/1.3.0

Adds "Location" field on catalog inventory
Test setup
Merge pull request #762 from FlightpathNY/master

Stripe payment provider
Merge remote-tracking branch 'merchello/master'
Merge branch '1.3.0'
Merge pull request #765 from rustyswayne/1.3.0

Stripe payment provider from master branch
Merge commit 'fetch_head' into ManualOrders-1.3.0