Final versio of server
Merge branch 'master' of https://github.com/PDSD-2014/barbu-ruta