Updated project and new gradle build file for migrating to Android Studio