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