Merge branch 'master' of github.com:cater2me/daily_sms
Merge branch 'cron'
merge