Refactoring / replacement / rewriting
Merge branch 'master' of https://github.com/lefevren/CryVR