Fixes
Merge branch 'master' of https://github.com/Jumpscale/jumpscale_core7

Conflicts:
	lib/JumpScale/grid/serverbase/DaemonClient.py