modify ssmtp,  add diary for x
add android diary
Merge branch 'master' of http://github.com/wwzbwwzb/truck