Implement conflict detection and resolution - frontend

We need a new UI in case a conflict needs manual intervention. It will be used to display differences between compared BaseOpenmrsObject objects. It will also enable user to choose which field (from local or foreign object) is to be accepted. Making a decision on each field is required. We also need an "Accept resolution" and "Cancel" buttons.

ACC:

• display data of generic OpenMRS objects
• implement mechanism for choosing one out of two fields (radio/button/...)
• add control buttons
• create documentation page on wiki