Merge branch 'release-0.2.1' into develop
Merge branch 'develop' of https://github.com/poderomedia/nodemapper into develop

* 'develop' of https://github.com/poderomedia/nodemapper:
Add conflict highlighting
Update the docs with the new options
Calm down the force layout
Adds the has-conflict demo pages
Merge the textbox branch
Merge branch 'develop' into feature/embed-demo

* develop:
  Update the docs with the new options
Add the embed and full screen demo
Update the documentation
Merge branch 'feature/embed-demo' into develop

* feature/embed-demo:
  Update the documentation
  Add the embed and full screen demo
  Adds the has-conflict demo pages
Add conflict highlighting and description.

- Improve the force layout display.
- Improve the basic styles.
- Add the has_conflict handling.
- Add the the description accessor and text box.
- Adds has_conflict demos for full-screen and embed.
Merge branch 'release/0.2.3'

* release/0.2.3:
  Add conflict highlighting and description.
  Update the documentation
  Add the embed and full screen demo
  Adds the has-conflict demo pages
  Calm down the force layout
  Update the docs with the new options
  Add conflict highlighting