gap-escaperoom

Merge branch 'feature/hub-texturing' of ssh://bitbucket.curiousmedia.com:7999/nicolaspicouet/gap-escaperoom into develop

# Conflicts:
#	GAP Escape Room/Assets/Bakery/ftGlobalStorage.asset
#	GAP Escape Room/UserSettings/EditorUserSettings.asset