Improved stability, additional caching, detached video thread from server
Merge branch 'master' into dev