Merge branch 'wetzel-temp' of ssh://tund/git/quorra into wetzel-temp

Initial commit do make warlock more compatible with jsonschema including references and inheritance.