commit-3-15-done
Merge pull request #14 from bxl1989/master

pull 3-15 done
modify sqlscript,insert site data
Merge pull request #16 from purejade/master

add userPanel menuPanel
Merge remote-tracking branch 'remotes/origin/master'
none
Merge pull request #2 from roselone/master

update