Merge branch 'master' of https://github.com/microhoods/microhoods
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Moved reply out of function and into handler in server