Changed project setup to support Android Studio 1.0