reformat login page
merge, new room controller
Merge branch 'master' of https://github.com/mxpan/virtualspace
add custom header
resolve merge conflict