Merge pull request #59 from karimnaguib/master

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