CRM-15108 fix - "Add to group" fails

https://issues.civicrm.org/jira/browse/CRM-15108
CRM-15128 - Prevent merging contact into self
Merge pull request #3852 from colemanw/mergeSelf

CRM-15128 - Prevent merging contact into self
JS cleanup
Merge pull request #3841 from monishdeb/CRM-15108

CRM-15108 fix - "Add to group" fails