Merge pull request #45 from purejade/master

wangjiayu
weibo two pic
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?