Android Studio Update

Imported into android studio to use with gradle.  Fixed warnings.