Patches notification gateway provider query.
Smtp Notification provider work and clean up check in.
Merge remote-tracking branch 'merchello/1.1.0' into 1.1.0
Updated nuspec file
Merge remote-tracking branch 'merchello/1.1.0' into 1.1.0
Merge remote-tracking branch 'merchello/1.1.0' into 1.1.0
Merge remote-tracking branch 'merchello/1.1.0' into 1.1.0
Fix build script to work with both VS12 and 13
shipping provider settings page fixes
Merge pull request #596 from protherj/test-110

Test 110
Shipping Fixes: Deletion of Methods, other fixes
Merge pull request #598 from protherj/ups-provider-fixes

Ups provider fixes
Merge branch '1.1.0' of https://github.com/rustyswayne/Merchello into 1.1.0
Internalized NotificationContext for the 1.0.2 verison
Changed Merchello Version to 1.0.2 to patch breaking Umbraco change
Merge pull request #595 from tomfulton/fix/M-250

Fix M-250: Update build script to work with VS12 and VS13
Refactored GatewayProvider to GatewayProviderSettings
Merge branch '1.0.2' into 1.1.0
Merges in IGatewayProvider Refactoring
Merge remote-tracking branch 'origin/1.1.0' into 1.1.0

Conflicts:
	src/Merchello.Core/Persistence/Migrations/Initial/BaseDataCreation.cs