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