GPII-270: added match maker proxy and the configuration for integrating with external multiple matchmakers.
GPII-270: added flat match maker as a default for a match maker proxy. Updated pref set example to have matchMakerType specified as the common term. Fixed a bug in lcm and inlcuded the lca module in base config.
GPII-270: improved the proxy match handler.
Merge branch 'master' into GPII-270

Conflicts:
	gpii/node_modules/lifecycleManager/configs/base.json
GPII-270: added tests for proxy.
Merge branch 'GPII-217' into GPII-270
Merge branch 'master' into GPII-270
GPII-270: fixed a typo.
Merge remote-tracking branch 'yzen/GPII-270'

* yzen/GPII-270:
  GPII-270: fixed a typo.
  GPII-270: added tests for proxy.
  GPII-270: improved the proxy match handler.
  GPII-270: added flat match maker as a default for a match maker proxy. Updated pref set example to have matchMakerType specified as the common term. Fixed a bug in lcm and inlcuded the lca module in base config.
  GPII-270: added match maker proxy and the configuration for integrating with external multiple matchmakers.
GPII-270: Renames the demo preferences set to something more explanatory.