Improve ServiceStudio's merge functionality

By André Ramos on 3 May 2011
The merge functionality should finally get an upgrade. For instance, ServiceStudio could mark who edited a given screen or action, so that non-conflicting merges could be made automatically.
Kilian Hekhuis4 May 2011
Also, it should be possible to mark changes for merge from the detail screens, not only by checking a checkbox on the overview screen. Also, it should be possible to mark changes on a finer scale, i.e. not just the whole screen or action, but parts of it.