Maven POM and gitignore

#1
Merge branch 'origin/master'