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

Conflicts:
	library/library.iml