Some modifications
some minor modifications
Merge branch 'master' of https://github.com/Jumpscale/jumpscale_core7

Conflicts:
	lib/JumpScale/baselib/hrd/HRD.py
	lib/JumpScale/baselib/jpackages/JPackage.py
	lib/JumpScale/baselib/jpackages/JPackageFactory.py
	lib/JumpScale/core/system/text.py
Fixes in OSIS