Updated due to mvn scripts.
Updated gitignore files.
Updated gradle files.
Merge branch 'develop'
Merge branch 'master' into release

Conflicts:
	.gitignore
Updated gitignore release file.