Merge branch 'gradle'
Modifying poms
Merged incoming
Update gitignore
Updated poms
Updated gitignore
acommit gradle build
Merge remote-tracking branch 'origin/master' into gradle