fixed regression in CRM-11301, due to changes in 4.4

----------------------------------------
* CRM-11301: Add / Edit Activity: create new contact option for With contact (target) field
  http://issues.civicrm.org/jira/browse/CRM-11301
Merge pull request #2029 from kurund/CRM-11301

fixed regression in CRM-11301, due to changes in 4.4
CRM-13780 fix - Don't allow users to attempt to merge  the Default Organization into another organization

http://issues.civicrm.org/jira/browse/CRM-13780
Remove html formatting from status message
Merge pull request #2030 from monishdeb/CRM-13780

CRM-13780 fix - Don't allow users to attempt to merge the Default Organization into another organization