Merge branch 'dev'
add action_mailer host
Merge branch 'hotfix'
reset password from gmail for dev & production
correctly display reset token form
Merge branch 'dev'
become link for logged-in admins
quick math mentor note
Merge branch 'dev'
don't upload youtube video if validation fails
Merge branch 'dev'
Merge schema
Added course-wide announcements
Authorize users before allowing changes to announcements
Fix a couple bugs with redirection to incorrect page and trying to display announcement where one isn't available
turbolinks works now? wtf
Merge branch 'dev'
link to help, close for flash alerts
let's not use real email addresses in seeds
modify copy and hide actions th for students