updated .gitignore
Merge branch 'master' of github.com:OpenSourceNZ/osnz-java-parent
upgraded