Concluding server work for now
Merge branch 'master' of https://github.com/jhbertra/autoMATE_server.git