add setting center
Merge branch 'master' of https://github.com/dymx101/PicStory

Conflicts:
	iOS/gongan/policeOnline/ThirdParty/MMDrawerController/MMDrawerBarButtonItem.m
	iOS/gongan/policeOnline/policeOnline.xcodeproj/project.pbxproj
problem