Mailing Labels - CRM-13396 - use addressee_display when possible when combining mailing addresses

----------------------------------------
* CRM-13396: Prefix missing in Mailing Labels when 'Merge labels for contacts with the same address' checked
  http://issues.civicrm.org/jira/browse/CRM-13396
profile api test fixes (caching & case on entities)
CRM-13234 fix profile api treatment of fields where DB doesn't match api name

----------------------------------------
* CRM-13234: facilitate data-entry-entities via api
  http://issues.civicrm.org/jira/browse/CRM-13234
CRM-13234 amend previous commit (commit hooks crash when I try to do a commit --amend)

----------------------------------------
* CRM-13234: facilitate data-entry-entities via api
  http://issues.civicrm.org/jira/browse/CRM-13234
CRM-13438 - detect / render subtype templates
Merge pull request #1695 from deepak-srivastava/subtype

CRM-13438 - detect / render subtype templates
CRM-13436 fix

----------------------------------------
* CRM-13436: Notices when saving Profile Settings
  http://issues.civicrm.org/jira/browse/CRM-13436
Merge pull request #1696 from monishdeb/CRM-13436

CRM-13436 fix
Expose max_related field in EDIT membership types if relationship_type_id has a value.
Merge pull request #1697 from davecivicrm/CRM-13451

Expose max_related field in EDIT membership types if relationship_type_i...
Merge pull request #1641 from PalanteJon/CRM-13396

Mailing Labels - CRM-13396 - use addressee_display when possible when co...
Merge pull request #1691 from eileenmcnaughton/CRM-13234

CRM-13234 fixes on profile api required due to added tests (caching issue, field mapping issue)