Merge branch 'FLUID-4609'

* FLUID-4609:
  FLUID-4609: Added new fluid.getLoader() function which allows path-aware fluid loading to be based from user's directory rather than Fluid's. Also a similar facility for fluid.require which allows the module lookup path to be based from the user's position (usually higher up the directory tree than fluid). We now also export fluid's "Error" object so that it can be used for configuring stack traces in node.js
Merge branch 'master' into FLUID-4675
Merge branch 'FLUID-4675'

* FLUID-4675:
  FLUID-4675: A testing stub for require() and fluid.require(). Thanks to Kasper for coding this with me.
FLUID-4633: Implementation and test cases for source tracking facility in ChangeApplier. Note that this has required some upgrade in the underlying framework implementation of ThreadLocal - core facility moved into Fluid.js for use in DataBinding.js
FLUID-4633: Reorganised threadLocal support to simplify renderer expander, which was previously broken. Weakened support for withEnvironment, added comments for these "loosely supported methods". Linting fixes to DataBinding.js which has seemingly not been linted in years.
Merge remote-tracking branch 'amb26/FLUID-4625'

* amb26/FLUID-4625:
  FLUID-4625: Fix to matchPath implementation which meets the goals of receiving notifications for changes at higher paths
Merge remote-tracking branch 'amb26/FLUID-4626'

* amb26/FLUID-4626:
  FLUID-4626: New "heterogeneous instantiator stack" system replaces old system with single instantiator entry with stack count, resolving problems in various multiple-instantiator scenarios
Merged conflict with FLUID-4626 changes which improved use of instantiator stack

Merge remote-tracking branch 'origin/master' into FLUID-4633

Conflicts:
	src/webapp/framework/core/js/FluidIoC.js
Merge remote-tracking branch 'amb26/FLUID-4633'

* amb26/FLUID-4633:
  FLUID-4633: Reorganised threadLocal support to simplify renderer expander, which was previously broken. Weakened support for withEnvironment, added comments for these "loosely supported methods". Linting fixes to DataBinding.js which has seemingly not been linted in years.
  FLUID-4633: Implementation and test cases for source tracking facility in ChangeApplier. Note that this has required some upgrade in the underlying framework implementation of ThreadLocal - core facility moved into Fluid.js for use in DataBinding.js
  FLUID-4633: Incomplete changeApplier work
  FLUID-4633: Incomplete work on the ChangeApplier
FLUID-4680: Implementation of context reference for "{that}"
FLUID-4066: Solved. edit changed to Edit

Signed-off-by: Justin Obara <obarajustin@gmail.com>
Merge branch 'FLUID-4066'

* FLUID-4066:
  FLUID-4066: Solved. edit changed to Edit
FLUID-3265 : Page titles in demo portal changed

Signed-off-by: Justin Obara <obarajustin@gmail.com>
Merge branch 'FLUID-3265'

* FLUID-3265:
  FLUID-3265 : Page titles in demo portal changed
Merge remote-tracking branch 'amb26/FLUID-4680'

* amb26/FLUID-4680:
  FLUID-4680: Implementation of context reference for "{that}"
FLUID-4685: Fixed the issue that 1em is always applied to body element at page load regardless its original font size.
Merge remote-tracking branch 'cindyli/FLUID-4685'

* cindyli/FLUID-4685:
  FLUID-4685: Fixed the issue that 1em is always applied to body element at page load regardless its original font size.