Compatibility with Android Studio v. 0.5.1
Merge branch 'android-studio'