Zeus update
Merge branch 'master' of https://github.com/Anastasoff/Telerik-Academy