Merge pull request #53 from karimnaguib/master

Universal Analytics 1.0.14
Merge branch 'master' of github.com:tsheasha/SkillAcademy
Welcome email
Welcome email
Merge pull request #55 from karimnaguib/master

Email Templates + Exclude Traffic
Merge branch 'develop' of github.com:tsheasha/SkillAcademy
Welcome email
Welcome email
Welcome email
Templates Fix