Almost last commit for admin sms
Fix some typos
Merge branch 'aug_8_2014'