Merge pull request #57 from karimnaguib/master

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