Merge branch 'multiuser'
Merge branch 'master' of https://github.com/Swarthmore/SwatSocial