Updated gradle files.
Updates.
Merge branch 'develop'