if mktg, redirects faq to mktg. else, to '/help'
fix syntax error in help_modal
add dummy FEEDBACK_SUBMISSION_EMAIL for debugging
change FEEDBACK_SUBMISSION_EMAIL to @example.com in dev settings
Merge pull request #673 from edx/hotfix/adam/help-modal

Hotfix/adam/help modal
Merge branch 'release'