siteinfo update3
Merge pull request #23 from roselone/master

update
Merge pull request #60 from bxl1989/master

picture
Merge branch 'master' of https://github.com/wendaiyulin/FootWith into wen
add modify user like
Merge pull request #61 from bxl1989/master

camera
update
Merge pull request #25 from roselone/master

update
update
Merge remote-tracking branch 'origin/master'
update
update
update
change server ip
Merge pull request #62 from purejade/master

add plan update
weiboTest
Merge branch 'master' of https://github.com/roselone/FootWith into roselone-master

Conflicts:
	client/src/main/java/edu/thu/cslab/footwith/client/helper/Constant.java