I-132651 500 error on challenges rss
Did not intend to commit to dev branch directly

Revert "I-132651 500 error on challenges rss"

This reverts commit fca9ab957fb2d7ce44bf7eaed2978d26dba1ca39.
I-132651 500 error on challenges rss
Merge pull request #364 from cloudspokes/thabo-I-132651-500-error-on-challenges-rss

I-132651 500 error on challenges rss
Merge branch 'dev' of https://github.com/cloudspokes/tc-api into thabo-I-129863-new-registration-emails
registration mail template changes