sync with master
add back the popup
change table to div
modify some styles
fix a bug
add the full version  support step 1
upgrade the full version supporty
prepare for merge
Merge branch develop