Move EMAIL_FROM to method (from class)
Merge remote-tracking branch 'origin/r3_upgrade_sue' into r3_upgrade_jen2
rm aptana project file