Finish server implementation
Merge branch 'master' of https://github.com/PDSD-2014/lazar-hotea-olteanu