Refact build.gradle
Merge branch 'dev'