fixed but with useractivity email
Merge branch 'develop' of github.com:klpdotorg/dubdubdub into develop
returning method
added html email templates
Merge branch 'develop' of github.com:klpdotorg/dubdubdub into develop
templates/email_templates should have email templates
Merge branch 'develop' of github.com:klpdotorg/dubdubdub into develop
moved mail sending method to instance method to enable resending
Merge branch 'develop' of github.com:klpdotorg/dubdubdub into develop