[Build] Updating Gradle to 2.1
[Build] Pushing resource version to 2.1.18
Merge branch 'release/2.1.18'
Merge branch 'release/2.1.18' into develop
[Build] Pushing resource version to 2.1.18-SNAPSHOT
Merge branch 'master' into develop