Updated gradle files.
Merge branch 'develop'