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