Changes to support moving to Android Studio
Merging conflicts