Updated to support Android Studio 0.5.2

These changes are required to build the application in Android Studio 0.5.2