Feature/iteration 6 dev issue 208

sms test works!! also have email test code in comment    xwen2