Update Gradle properties
Merge remote-tracking branch 'origin/master'
Update gradle wrapper