Add gradle files for Android Studio
Merge branch 'as' into develop