Sync 2.0 Sprint 12 review - conflict resolution

We’ve finished Sprint 12.

Sprint goal: Conflict resolution

Sprint tickets: https://issues.openmrs.org/browse/SYNCT-278?jql=project%20%3D%20SYNCT%20AND%20Sprint%20%3D%20251

The most important tickets connected with sprint goal : https://issues.openmrs.org/projects/SYNCT/versions/24404

Wiki - https://wiki.openmrs.org/display/projects/Conflict+detection+and+resolution

cc/ @abendor @simba @jslawinski @c.antwi @burke

Because of problems with demo servers (more info here - Configuration problem on sync demo servers) we did not organize sprint demo call in this week, however as soon as we fix the problems, we will organize a meeting with OpenMRS community.