trying to get integration tests working again
trying to get integration tests working again
Merge branch 'master' of git@github.com:msokolov/lux-appserver

Conflicts:
	pom.xml