Merge pull request #1 from eggforsale/master

latest version for production
Merge pull request #2 from eggforsale/develop

Merge pull request #1 from eggforsale/master