File ignore update
Merge branch 'master' into maven