Fixes in osis jpackage
Merge branch 'master' of https://github.com/Jumpscale/jp_jumpscale7

Conflicts:
	osis/actions.py
	osis/jp.hrd