Merge pull request #4709 from ahbeng/icefloor-2.0.2

Icefloor 2.0.2
update lyrics-master to 2.4.1
Upgrade Xiami.app to v1.3.1-1821
Change Atom download to HTTPS
Merge pull request #4328 from leoj3n/switchresx-4.x

[WIP] SwitchResX 4.x
Merge pull request #4711 from shishi/update_lyrics_master

update lyrics-master to 2.4.1
Merge pull request #4713 from MrGba2z/xiami

Upgrade Xiami.app to v1.3.1-1821
Merge pull request #4714 from ndr-qef/atom-https

Change Atom download to HTTPS
expand trailing '+' when not part of version number
abstract none_string in doctor
abstract error_string in doctor
render empty doctor values with <NONE>
add locale variables to doctor

references: #4677
move notfound_string to method
move privledged_uid to method in doctor
move fq_default_tap to method in doctor
move alt_taps to method in doctor
move default_cask_count to method in doctor
move homebrew_origin to method in doctor
Added CapSee