Team member edits, first pass fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/panels/work-lens.html