Code formatting update
Merged
Merge branch 'master' of git@github.com:pvanassen/ns-api.git

Conflicts:
	pom.xml