Move all the fields into a single table for easy comparison of source an...

...d target values

The original code displays each field as its own table and hides properties in a collapsible fieldset, and it's not clear which is the source and which is the target. This change makes the field values easier to see and compare by moving them into a single table labeled to show which are source and which are target values.

![simple_entity_merge___msnbc-2](https://f.cloud.github.com/assets/633808/1499738/584ae5ec-4862-11e3-9b1e-1e684e1f567b.png)