fixed bugs

data-key的问题
Merge branch 'master' into gh-pages