matrix features
Merge branch 'master' of github.com:nguillemot/valkyrie
refactored into engine/framework