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

Conflicts:
	.idea/gradle.xml