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'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
link to help, close for flash alerts
let's not use real email addresses in seeds
Merge branch 'master' into dev

Conflicts:
	app/views/layouts/home.html.erb