fixes
Merge branch 'master' of https://github.com/romaninsh/dokku-alt-manager

Conflicts:
	Dockerfile
	config-dist.php