Merge pull request #101 from karimnaguib/master

Hotfixes
Redirecting old search urls to new search woth 301 redirect
Redirecting old search urls to new search woth 301 redirect
Encode error in email upcoming
Encode error in email upcoming
Encode error in email upcoming
Not Started Icon
Merge branch 'develop' of github.com:tsheasha/SkillAcademy