updated new stuff
Merge branch 'master' of github.com:cptactionhank/docker-atlassian-stash

Conflicts:
	.travis.yml