merged
merge fix
Merge branch 'master' of github.com:songz/knockout
Merge branch 'master' of github.com:songz/knockout
add persistent rooms