update gitignore to properly avoid maven target folders.
Revert parts of the .gitignore fix related to ant.
Merge remote-tracking branch 'upstream/master'