Changes made by Мартин Гебов (martin.gebov@fdiba.tu-sofia.bg).
Merge branch 'master' of https://github.com/telerikhackteam14/hackteam14.git