Updated gradle files.
Merge branch 'develop'
Merge branch 'master' into release

Conflicts:
	.idea/modules.xml
	settings.gradle
Updated gradle files.