Merge pull request #13 from WebSoc/tornado

Tornado into master
Merge branch 'master' of https://github.com/WebSoc/lunar-cloud into tornado