Merge pull request #65 from bxl1989/master

two picture
update  addplan and favorate_site
update  addplan and favorate_site
update  addplan and favorate_site
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