Modified master branch to reflect the Android Studio layout
Manually merged changes from the android-studio branch
Added Android Studio note to README