Merge branch 'master' of github.com:NickQiZhu/dc.js