typing scene complete
Merge branch 'feature/typing-scene' into develop