CRM-14327 - Cleanup custom delete links
Merge pull request #2773 from colemanw/custom

CRM-14327 - Cleanup custom delete links
removed unwanted file
correct record_type_id description

fixed per further discussion http://forum.civicrm.org/index.php/topic,31282.msg136415.html#msg136415 with Eileen
Tweak to CRM.popup
CRM-14407 - Fix case custom field popup
Merge pull request #2776 from colemanw/caseCustom

CRM-14407 - Fix case custom field popup
CRM-14407 - Fixup case custom tpl
Improve dialog titlebar button style
Add dialog resize button
CRM-14408 - handle accordions automatically
CRM-14408 - get rid of unnecessary calls to crmAccordions
Merge pull request #2777 from colemanw/accordions

js work
Merge pull request #2775 from ErichBSchulz/patch-3

correct record_type_id description
CRM-14399 add alterCalculatedMembershipStatus hook

Conflicts:
	api/v3/MembershipStatus.php
GenCode - Apply SQL-escaping to table comments

Fix regression stemming from 9e64deca
Merge pull request #2787 from totten/master-gencode-escape

GenCode - Apply SQL-escaping to table comments
CRM-14399 one more call to getMembershipStatusByDate + update add function call to be more standard
Merge pull request #2785 from eileenmcnaughton/CRM-14399-master

CRM-14399 add alterCalculatedMembershipStatus hook
CRM-14399 this is probably safer & less like to wind up @colemanw than the prev version on this line