oss
Merge branch 'master' of https://github.com/jumpscale/oss

Conflicts:
	apps/osis/logic/oss/model.spec