Added title, merged from up-to-date server version
Merge branch 'master' of https://github.com/lorsem/SmartStream
Added file (STUB)