update
Merge branch 'master' of github.com:liuxiaodong/cryptoJS
desc