Feature/android studio 0.6

support android studio 0.6