Moved email and sms subscription logic to the User model
Merge branch 'wip' of https://github.com/tmcyf/tmcyf into wip