Update_o_final?
Merge branch 'master' of https://github.com/snakeninny/SMSNinjaUI

Conflicts:

SMSNinjaUI.xcodeproj/project.xcworkspace/xcuserdata/snakeninny.xcuserdat
ad/UserInterfaceState.xcuserstate

SMSNinjaUI.xcodeproj/xcuserdata/snakeninny.xcuserdatad/xcdebugger/Breakp
oints_v2.xcbkptlist
	SMSNinjaUI/SNBlacklistViewController.m
	SMSNinjaUI/SNBlockedCallHistoryViewController.m
	SMSNinjaUI/SNBlockedMessageHistoryViewController.m
	SMSNinjaUI/SNContentViewController.m
	SMSNinjaUI/SNMainViewController.m
	SMSNinjaUI/SNNumberViewController.m
	SMSNinjaUI/SNPrivateCallHistoryViewController.m
	SMSNinjaUI/SNPrivateMessageHistoryViewController.m
	SMSNinjaUI/SNPrivatelistViewController.m
	SMSNinjaUI/SNSettingsViewController.m
	SMSNinjaUI/SNTimeViewController.m
	SMSNinjaUI/SNWhitelistViewController.m
	SMSNinjaUI/en.html
	SMSNinjaUI/en.lproj/Localizable.strings
	SMSNinjaUI/zh-Hans_fake.txt