Removed HTML from es.xml, fixed typo in en_us.xml
Merge pull request #655 from koswesley/Localization

Removed HTML from es.xml, fixed typo in en_us.xml
Added binding functionality to the Gateway Providers > Notification Providers edit flyout.
Merge branch '1.2.0' of https://github.com/Merchello/Merchello into 1.2.0
Merge pull request #656 from cssquirrel/1.2.0

1.2.0
Merge branch '1.2.0' of https://github.com/rustyswayne/Merchello into 1.2.0