Merge branch 'master' into mjd3
Merge branch 'mjd3' of https://github.com/dschen/roommeet into mjd3