all
a
Merge branch 'master' of https://github.com/javalixue/wenda

Conflicts:
	wenda.xcodeproj/project.xcworkspace/xcuserdata/enruisuo.xcuserdatad/UserInterfaceState.xcuserstate
	wenda/UserAnswerController.m
	wenda/UserQuestionController.m