lcw

sync
Merge branch 'master' of https://github.com/TeamOfFBAuto/fblifebbs

Conflicts:

fblifebbs/Controls/MyControl/Controllers/MyWriteAndCommentViewController
.m
	fblifebbs/Controls/MyControl/Controllers/ShoucangViewController.m