Merge of persons started
Added a merge entity that is supposed to handle the merge logic
Stabily adding a merge
Merged mergeVO :) from feature branch
Merge remote-tracking branch 'origin/master'