updated icons for editing concurrent usage, but db needs changing for normal display
Merge branch 'develop' of github.com:k-int/KBPlus into develop
Re-add bang important to table components css
Owens em changes for icon on sort ordering
Merge branch 'develop' of github.com:ostephens/KBPlus into develop

Conflicts:
	app/web-app/css/bootstrap.css