Merge Dev to Branch?

Pull all dev code to master without deleting dev, just to save current state of Ubisoft prototype.