Add support for Android Studio 1.0
Merge branch 'feature/gradle_2' into develop