merge from gh-pages
update data
Merge branch 'dev' into jquery