Work-In progress & update to Android Studio 1.0