fix small bugs
Merge pull request #62 from purejade/master

add plan update
weibo
weibo
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
weibo
Merge pull request #64 from bxl1989/master

fix bug?
Merge pull request #44 from roselone/master

access token
weibo two pic
add sinaWeiboToken
.
fix conflict
Merge pull request #65 from bxl1989/master

two picture
Merge pull request #45 from purejade/master

wangjiayu
weibo two pic
Merge pull request #67 from purejade/master

addpan update
Merge branch 'roselone-master'

Conflicts:
	client/src/main/java/edu/thu/cslab/footwith/client/AddPlan.java
Merge pull request #69 from bxl1989/master

fix bug?
weibo two pic