Update to 0.3.6
Fix compatibility with Android Studio 1.0
Fix compatibility with Android Studio 1.0
Fix compatibility with Android Studio 1.0