Updated to support Travis CI and integration tests
Merge branch 'master' of github.com:cptactionhank/docker-confluence

Conflicts:
	Dockerfile