Merge pull request #43 from UAB2014/development

Proiect final