Update.
Updated pom.xml.
Merge branch 'develop'
Merge branch 'master' into release-support
Merge branch 'release-support' into release

Conflicts:
	library/AndroidManifest.xml
	script/update-maven.bat