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
demo db and a couple of fixes/changes
Merge pull request #26 from protherj/qa-4

demo db and a couple of fixes/changes
Merge branch 'master' of https://github.com/rustyswayne/RosettaStone