Merge pull request #80 from jpgg/dev

Dev to Master for Ubisoft Prototype