back out some things
Merge remote-tracking branch 'origin/master' into Four51
save
save
add checkout circle around icon, badge
badge text needed its own  light dark checks
save
Dropdown-mega checkbox
Merge branch 'Four51'

Conflicts:
	app/css/app.css