Merge pull request #2 from OckhamsRazor/jane

Jane
mid
Merge pull request #3 from OckhamsRazor/janelai

mid
merge
Merge pull request #4 from OckhamsRazor/janelai

merge
merge
Merge pull request #5 from OckhamsRazor/bosh

merge
modify
add/delete room 
add/delete user
Merge pull request #6 from OckhamsRazor/bosh

Bosh
functions