add menu clear global config
Merge remote-tracking branch 'upstream/master'

Conflicts:
	scripts/doctor.js