FLUID-5161: Renamed uiOptions dir in build-scripts
Merge remote-tracking branch 'cindy/FLUID-5161' into FLUID-5161

Conflicts:
	src/tests/framework-tests/preferences/html/CSSGenerator-test.html
Merge remote-tracking branch 'justin/FLUID-5161' into FLUID-5161
FLUID-5161: Fixed unit tests.