SMS/email debug
Merge dev into dev_xue
ad hoc debug