FLUID-4907: Expanded the "@" references in the auxiliary schema with the actual values.
Merge branch 'master' into FLUID-4907
FLUID-4907: Adding preference maps

Added preference maps to the panels and enactors. Had to create grades for the textFont and contrast and used the classSwapper as a grade for them. This is so that we could specify different preferenceMaps for each case in the components defaults.
FLUID-4903: added working schema grades.
FLUID-4903: updated names for schema grades. Added missing grades.
Merge branch 'master' into FLUID-4903
Merge branch 'master' into FLUID-4907
FLUID-4907: Added the unit test for expanding templates to retrieve schema values.
Merge branch 'master' into FLUID-4907

Conflicts:
	src/webapp/components/uiOptions/js/Enactors.js
	src/webapp/components/uiOptions/js/UIEnhancer.js
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907
FLUID-4907: Added one more unit test for schema expander. It fails at this point.
Merge remote-tracking branch 'cindy/FLUID-4907' into FLUID-4907
FLUID-4907: Added auxBuilder grade.

Added a grade which will handle the expansion of the auxiliary schema.
FLUID-4903: first pass at primary schema builder.
FLUID-4903: added tests for schema merging process.
FLUID-4907: refactored AuxiliaryParser

Refactored the parser code to simplify the expansion functions. This also enabled for the removal of the fluid.uiOptions.auxiliaryExpander function, as the fluid.uiOptions.expandSchema function can be used directly now. Also fixed the bugs in expandSchema that were causing it to generate the incorrect output. Unit test are all passing, but still need an additional one for the fluid.uiOptions.auxBuilder grade.
FLUID-4903: added all tests and functionality for primary schema merge. One test is failing due to the gradeNames order.
FLUID-4903: fixed primary schema merging order.
FLUID-4907: Added test for auxBuilder grade

Added a test for the fluid.uiOptions.auxBuilder grade. Also performed some minor refactoring to share values between the other tests.
FLUID-4903: updated the pull to @amb26's comments.