#110 UI Res Config issues
Merge remote-tracking branch 'origin/ui-res-config-issues-110'

Conflicts:
	HDX-System/src/main/webapp/css/style.css