Updated server work
Merge branch 'test' of https://github.com/PDSD-2014/parvu-traistapopescu into test