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