Server updates
Merge branch 'master' of https://github.com/devasiajoseph/somethinglocal-multi