Initial commit of Android Studio project. Moving away from Eclipse.
Fixed merge conflicts