.
Merge remote-tracking branch 'rosetta/master'

Conflicts:
	src/website/Config/ClientDependency.config
Fixed bug caused in Merchello on Gateway Providers page where notifications provider "edit" was causing an invalid url error.
Merge remote-tracking branch 'rosetta/master'
Fixes pathing issue for GatewayProviders notification provider popup.
Merge remote-tracking branch 'rosetta/master'

Conflicts:
	src/website/App_Plugins/Merchello/Modules/Settings/GatewayProviders/Dialogs/smtp.notifications.providersettings.html
	src/website/bin/Merchello.Core.dll
	src/website/bin/Merchello.Examine.dll
	src/website/bin/Merchello.Web.dll
Added clearfix to smtp.notifications.providersettings.html to prevent colored box from not wrapping around notification editor form.
Added binding functionality to the Gateway Providers > Notification Providers edit flyout.
Merge pull request #19 from cssquirrel/master

Added data-binding functionality to Gateway Providers > Notification Provider edit button.
Merge remote-tracking branch 'rosetta/master'