Merge pull request #122 from samtstern/master

Updating to work with Android Studio 1.0