Update project for android studio 0.8
Fix up the gitignore
Merge pull request #27 from shekibobo/update-project-studio

Update project studio
Merge remote-tracking branch 'upstream/develop' into develop