fixed merge conflict with develop
fixed merge conflict with develop

  broken meta examples because of enum classes. will fix later.

besser82/shogun,lambday/shogun,karlnapf/shogun,sorig/shogun,lambday/shogun,lisitsyn/shogun,besser82/shogun,lisitsyn/shogun,lisitsyn/shogun,karlnapf/shogun,besser82/shogun,shogun-toolbox/shogun,sorig/shogun,besser82/shogun,shogun-toolbox/shogun,geektoni/shogun,geektoni/shogun,lisitsyn/shogun,geektoni/shogun,sorig/shogun,sorig/shogun,lambday/shogun,shogun-toolbox/shogun,geektoni/shogun,shogun-toolbox/shogun,besser82/shogun,sorig/shogun,karlnapf/shogun,lambday/shogun,besser82/shogun,karlnapf/shogun,geektoni/shogun,lisitsyn/shogun,lisitsyn/shogun,karlnapf/shogun,sorig/shogun,lambday/shogun,shogun-toolbox/shogun,karlnapf/shogun,lambday/shogun,geektoni/shogun,shogun-toolbox/shogun