.
Merge branch 'master' of github.com:neutrico/phpmaven-var-parent

Conflicts:
	pom.xml
.
Merge branch 'master' of github.com:neutrico/phpmaven-var-parent

Conflicts:
	pom.xml