Add feed_url and feed_categories field and change in feed parse
Merge branch 'general_changes'
merged branch and email template set