Changes made by Svetoslav Petsov (Svetoslav.Petsov@telerik.com).
Merge branch 'master' of https://github.com/dokov/hackaton-team12.git