Add build.gradle
Merge branch 'gradle'