data updated;
Merge branch 'dev' into angularjs