data updated
fix order bug
Merge branch 'angularjs' into gh-pages
compress js