merged data with frontend branch

next commit will add some new features
Revert "merged data with frontend branch"

This reverts commit 689e32ebd7942c02b65344b7191879e331b7087f.
Revert "Revert "merged data with frontend branch""

This reverts commit 39d30be294302f6e532d85e32a0a9b1d0703fc43.
update
update2
upate3
commit_fail