important:check changes & cleanup to portal start
Merge branch 'master' of https://github.com/jumpscale/jumpscale_core

Conflicts:
	lib/JumpScale/grid/osis/OSISFactory.py