Merge branch 'master' into FLUID-5205
Merge remote-tracking branch 'anastasia/FLUID-5205' into FLUID-5205
Merge remote-tracking branch 'anastasia/FLUID-5205' into FLUID-5205
Merge remote-tracking branch 'anastasia/FLUID-5205' into FLUID-5205
FLUID-5222: build and init func for prefsEditor

Added fluid.prefs.create as a single build and init function for the prefsEditor. Unit tests and demos need to be updated still.
FLUID-5222: Updated manual tests

Updated the manual tests to use fluid.prefs.create function.
FLUID-5222: Fix the unit tests for aux builder since the default namespace for the constructed prefs editor is improved to be a random string.
Merge remote-tracking branch 'cindy/FLUID-5222' into FLUID-5222
FLUID-5222: Verify the auto-generated namespace by the aux builder for prefs editor.
Merge branch 'FLUID-5222'

* FLUID-5222:
  FLUID-5222: Fix the unit tests for aux builder since the default namespace for the constructed prefs editor is improved to be a random string.
  FLUID-5222: Updated manual tests
  FLUID-5222: build and init func for prefsEditor
Merge branch 'FLUID-5222'

* FLUID-5222:
  FLUID-5222: Verify the auto-generated namespace by the aux builder for prefs editor.
Merge branch 'master' into FLUID-5205

Conflicts:
	src/tests/framework-tests/preferences/html/Builder-test.html
	src/tests/framework-tests/preferences/js/BuilderTests.js
FLUID-5205: Updated instructional demos

Updated the instructional demos to use the new fluid.prefs.create function.
Merge remote-tracking branch 'justin/FLUID-5205' into FLUID-5216
FLUID-5216: Updated to use new single-function creation+invocation of the prefs editor