更新
Merge branch 'master' of https://github.com/HappyU/HLoggerForIOS

Conflicts:
	HLoggerForIOS/AppDelegate.m