Updating ConflictResolution roadmap

Changes:
* Added the old 0.2.0 version where the only addition is the ability for
the server to notify clients of the availablity of new data.

* Incremented the versions of all the versions later than 0.2.0 to
  reflect the change.

* Some minor spelling corrections.
moved misplaced paragraph