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