Sync with latest 1.2.0 Merchello, updated DB
Merge pull request #25 from protherj/qa-3

Sync with latest 1.2.0 Merchello, updated DB