Merge pull request #33 from roselone/master

web support for getting plans and records
icons resource
icons resource sec
fix merge
client update gui add basic and its detail
client update gui add basic and its detail again
Merge pull request #34 from roselone/master

update json and so on
update DB, fix bugs in utility and messager
Merge branch 'roselone'
replace SiteID userID with Names, fixed utf-8 problems
fixed json bugs
client update gui add menu and its detail again and so on prepare to add camera
Merge pull request #49 from bxl1989/master

basic and menu
Merge pull request #1 from roselone/master

all
hello test
delete hello test
test 2
delete tset2
province site list
add journal web service