Commits

Merge branch 'feature/texturing-test' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop # Conflicts: # GAP Escape Room/Assets/_Content/Game/Scenes/Hub.unity # GAP Escape Room/UserSettings/EditorUserSettings.asset