[Feature] In-progress: Support for "contextual" keyboard shortcuts
Merge branch 'master' of https://github.com/MakeBetter/Units

Conflicts:
	content_scripts/mod_CUsMgr.js