data updated;
Merge branch 'dev' into angularjs
Merge branch 'angularjs' into gh-pages