Updated gradle scripts + minor project files.
Merge branch 'develop'
Merge branch 'master' into release

Conflicts:
	examples/examples.iml