Switch to Android Studio
Merging