http://issues.fluidproject.org/browse/FLUID-3761 was also fixed in this branch

Branch merged into project repo at: aa5efc1e1a20aaa152f2e7e2d4edfbb35e08c5ea

The full list of commit logs for this branch is:

Merge branch 'FLUID-4267'

• :
  : Sloved the async template loading issue that causes the ui options tests fail on firefox.
  : Fixing the integration demo to work with the new settings.
  : Reviving the uiEnhancer.updateModel
  : Removed preview image dir from demo
  : Added full no preview component and added to demo
  : Split the store tests out from UIEnhancer. Added Store.js to the demos and tests. Moved the demands block for set
  : De-tabbed, linted js file
  : Created js file for Full with Preview version of UIO and added to demo
  : Refactored the textfieldSlider tests slightly. More tests to be added in the branch.
  : fixed path to ariaTabs in demo
  : Pulling the storage strategy for settings out of UIEnhancer. Moving defaultSiteSettings into uiOptions.store.
  : style clean up, removed fat demo js file (not used)
  : Move validateValue() tests out of UIOptions and into TextFieldSlider tests
  : Fixed save button check
  : Dependency updates
  : Reverted UIO amalgateClasses work, moved tabs to be subcomponent of UIO instead of FPanel, moved ariaTabs and adde
  : Make validateValue() function of the textSlider public and add unit tests for this function
  : Added almalgateClass to fetchResources in UIOptions.js, so it waits for control templates to load as well. Add pri
  : Added UIO component unit tests. Much more to follow.
  : Implemented a component to apply specific css styles to the options on the dropdown list of "text style" and "colo
  : Fat panel js, commenting out enhancer to debug
  : Fat panel js, UIOptions as subcomponent
  : Fixing a bug in the UIEnhancer which references 'container' instead of 'that.container'. Updating FullPreviewUIOpt
  : Created the pageEnhancer and moved the global UIEnhancer into the static environment. Started to remove UIOptions
  : Fat Panel js
  : 1. implemented the multiplier for font size and line spacing; 2. modified the textfield slider to increment in 0.1
  FLUID_4267: Auto-save component option
  : Clean up for control templates, affecting full with and without preview UIOptions layouts
  : removed the comment on event bindings that was introduced by mistake.
  : Uncommented bindhandler line
  : Cleaning up css for control templates and full UIOptions
  : Adding UIOptions test page.
  : Styling control templates for full no preview. Cleaning up css in general
  : Added control templates to Full no preview
  : Linting
  : Fixing up unit tests and component code with Justin
  : Converted the animation to invokers
  : Fixing up unit tests and component code with Justin
  : Fat Panel styling
  : Fat Panel styling
  : Replaced all {controls}s with {uiOptions}s and fixed unit tests.
  : Adding control templates to fat panel
  : Adding JQ UI tabs to fat panel layout
  : Moving jq UI tabs from /demos/lib to /lib
  : Moving jq UI tabs from /demos/lib to /lib
  : Merging, adding JQ UI tabs to fat panel layout
  : Added events to Sliding Panel component. Unit tests need tweaking
  : Added events to Sliding Panel component. Unit tests need tweaking
  : Re-adding test file after graph-flip fix caused reversion.
  : Refactored Sliding Panel component and started unit tests
  : Removed tabs js, to be replaced with jQuery UI tabs
  : Getting live preview basically working
  : Fixed vertical alignment of columns
  : Start of the SlidingPanel component
  : Fixing column styling in full page no preview UIO
  : Tabs component in the works
  : Sliding panel component almost done, tab component half done
  : Separated out full page UIO styles
  : Refactoring CSS to separate out full page UIO styles
  : Removed standalone demos, moved into regular demo area; created new demo for no preview UIO
  : Starting the tabs component
  : Creating new full page without preview template
  : Fat Panel styling
  : Separated full page with preview configuration out, and made UIOptions.css a global stylesheet for all configurati
  : Fixed paths in full preview demo, continued work on fat panel
  : Styling and markup tweaks to the full page UI options to match wireframes
  : Fat panel work, tabs
  : Tweaking layout styles and adding cancel and save icons
  : Restructuring UIO demos to include different layouts, adding Fat Panel version
  : Modified slider styling.
  : Clean up of UIO for 1.4 styling
  : UIO 1.4 styling
  : Backed-out the rich dropdown
  : Adding in rich dropdown jquery ui plugin
  : Adding in rich dropdown jquery ui plugin
  Starting changes to UIO for 1.4, based on James's mockups
  Starting changes to UIO for 1.4, based on James's mockups

Pushed in the fix for at revision 1c25cfac4a50e63bb3e3 to fix the asynchronous template loading issue.

Merged https://github.com/michelled/infusion/tree/FLUID-4262 at f21c2ab5432ea14a35ac9ca950f6e306aea81cb0