update data
Merge branch 'dev' into jquery