salt-grand-master
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dockerfile
	README.md
	salt/minion
	srv/salt/top.sls
delete