CRM-13995 fix export when merging households
CRM-13977 related fix

----------------------------------------
* CRM-13977: activities report fails to add contacts to group - fatal error
  http://issues.civicrm.org/jira/browse/CRM-13977
Merge pull request #2273 from monishdeb/CRM-13977

CRM-13977 related fix
CRM-13892 : fix upgrade function
Merge pull request #2290 from yashodha/CRM-13892

CRM-13892 : fix upgrade function
strict warning fixes
Merge pull request #2293 from kurund/notice-fixes

strict warning fixes
CRM-14049 allow on-hold email when retrieving details and pass contactId if exists
Merge pull request #2296 from lcdservices/CRM-14049

CRM-14049 allow on-hold email when retrieving details and pass contactId...
Update Main.php

Fix form rule error for number of pledge installments.
Merge pull request #2223 from lcdservices/CRM-13995

CRM-13995 fix export when merging households
Additional change needed to get Country column exported for merge into household.
Merge pull request #2300 from davecivicrm/CRM-13995

CRM -13995 - Additional change needed to get Country column exported for merge into h...
CRM-13995 - Add is_object check to prevent notices.

----------------------------------------
* CRM-13995: contact export when merging households: some household fields missing
  http://issues.civicrm.org/jira/browse/CRM-13995
Merge pull request #2301 from davecivicrm/CRM-13995a

CRM-13995 - Add is_object check to prevent notices.