Merge conflict
Merge conflict resolved
Merge conflict resolved
Merge branch 'master' of https://github.com/DaysOfThePhoenix/TeamFranciumTelerikAcademy