+ integrated player/enemy timeline uis into the main view
Merge branch 'local'