after menu change
Merge branch 'master' of https://github.com/humblec/dockit

Conflicts:
	dockinstall/install.py
	dockit/dockit.py
	dockutils/run_helper.py