client functional
Merge branch 'master' of ssh://github.com/PDSD-2014/lazar-hotea-olteanu