Migrate to new Android Studio project structure
Merge pull request #622 from timrae/develop

Migrate to new Android Studio project structure