Merge branch 'release/0.2.3' into develop

* release/0.2.3:
  Add conflict highlighting and description.
Update the project name
Bump the version number
Merge branch 'release/0.2.4'

* release/0.2.4:
  Bump the version number
  Update the project name
Merge branch 'master' into gh-pages

* master:
  Bump the version number
  Update the project name