Fixed ErrorWranings
Merge remote-tracking branch 'origin/danih_ui_redesign' into danih_ui_redesign

Conflicts:
	jWic/web/jwic/jwic_controls.js