Adding build.gradle because Android Studio has been very bad with this.
Merge remote-tracking branch 'origin/develop' into develop