update for android studio 1.0.  change gradle to allow it to build in new gradle file.  see readme.md about steps for migration.
Merge remote-tracking branch 'origin/master'