update branch for wip and demo server
monkey patch for actionmailer DOS
Merge branch 'rm_production' into wip-open