GPII-91: Added a comment to lifecycle manager's resolver's mergePolicy.
Merge branch 'GPII-91'

* GPII-91: (33 commits)
  GPII-91: Added a comment to lifecycle manager's resolver's mergePolicy.
  NOJIRA: Removed git ignore.
  GPII-91: added a crazy merge policy to make the lifecycle resolve work again. Updated to the latest express.
  GPII-91: added unexpected error handler in node.
  GPII-91: Addressed all basic comments.
  GPII-91: Removed static middleware for now.
  GPII-91: Updated package.json to contain SHA for infusion and jqUnit dependencies.
  GPII-91: updated readme.
  GPII-91: Added readme and gitignore for universal.
  GPII-91: Removed all node_modules. Updated package json
  GPII-91: Resolved merge interference, all mentions of gpii.renderer.
  NOJIRA: Updating to the latest xml-mapping that incorporates the attribute name fixes.
  GPII-91: fixed merge conflicts.
  NOJIRA: Fixed XMLSettingsHandler tests.
  NOJIRA: Updated xml-mapping , test still fails, needs to be updated
  NOJIRA: updated xml settings handlers tests with escaped backslashes. Updated xml-mapping from yzen's branch.
  NOJIRA: Committing a XML settings handler tests in the stage that show a failure of json to xml conversion.
  GPII-76: Slightly updated XML settings handler tests.
  GPII-76: Updating gpii.app to the new awesome framework.
  GPII-91: Fixed merge conflict.
  ...
Merge branch 'master' into GPII-76