Slowly moving towards better organized MVC
Merge branch 'master' of https://github.com/UManitobaOcho/OchoServer