update some files
Merge branch 'master' of github.com:aralejs/messenger