ignore target
minor changes in pom
Merge branch 'master' into mark
Merge branch 'master' into mark

Conflicts:
	.gitignore
syntax