Do not flatten framework folder
Merge pull request #1685 from garnett/garnett-fork

Calabash: Do not flatten framework folder