合并主干
Merge remote-tracking branch 'origin/master'

Conflicts:
	NightTools/AndroidManifest.xml
	NightTools/res/values/strings.xml