Put back build.gradle
Merge branch 'master' into prod