Merge pull request #54 from karimnaguib/master

Analytics and Mail Templates
Merge branch 'master' of github.com:tsheasha/SkillAcademy