Merge branch 'master' into FLUID-4907
Merge branch 'master' into FLUID-4907
FLUID-4907: Create message json files for each panel and top level uiOptions. The fat panel demo is broken that the page doesn't respond to some preference changes.
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907