Update the docs with the new options
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