Updated to Android Studio project