Update gitignore
Update build for Android Studio 0.6.1
Merge branch 'develop'