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

Conflicts:
	lib/JumpScale/baselib/jpackages/JPackage.py