Adds support for Android Studio 1.0
Merge pull request #385 from liato/feature/android-studio-1.0

Adds support for Android Studio 1.0