Fix null pointer exception
Upgrade project to support Android Studio v0.3.0