Merge pull request #6432 from deepak-srivastava/dedupe-workflow-47

CRM-16865: Mass Dedupe Workflow Improvements

diff --cc CRM/Contact/Page/AJAX.php
Simple merge

diff --cc CRM/Contact/Page/DedupeFind.php
Simple merge

diff --cc CRM/Core/BAO/CustomValueTable.php
Simple merge

diff --cc CRM/Core/BAO/PrevNextCache.php
Simple merge

diff --cc CRM/Core/Permission.php
Simple merge

diff --cc CRM/Core/xml/Menu/Contact.xml
Simple merge

diff --cc CRM/Dedupe/Merger.php
Simple merge

diff --cc templates/CRM/Contact/Page/DedupeFind.tpl
Simple merge