Merge pull request #58 from karimnaguib/master

Template Fix 3
Email Template Fix 5
Merge branch 'develop' of github.com:tsheasha/SkillAcademy