more work to carrierwave, started mailer
Merge branch 'dev' into carrierwave-2