Fixed for CRM-13146
CRM-13201 add hook to alter tpl file in use
worked on CRM-13203
clean up
fix the sending copy of email to assignee(CRM-13203)
Add pseudoconstant to activityAssignment xml
Fix typo
Merge pull request #1408 from colemanw/master

Add pseudoconstant to ActivityContact.xml
CRM-13177 quick fix to add border on jQuery ui-dialog.

----------------------------------------
* CRM-13177: Add border to popup dialogs
  http://issues.civicrm.org/jira/browse/CRM-13177
Merge pull request #1382 from swati-karande/CRM-13146

  Fixed for CRM-13146
Tested with one and two instances of double-quote and single-quote. Fixes the problem.
CRM-13177 Remove important! since it seems to work ok without that

----------------------------------------
* CRM-13177: Add border to popup dialogs
  http://issues.civicrm.org/jira/browse/CRM-13177
Merge pull request #1409 from davecivicrm/CRM-13177

CRM-13177 quick fix to add border on jQuery ui-dialog.
CRM-13159 add missing period end of sentence and fix unrelated typo spelling in Address.php

----------------------------------------
* CRM-13159: relationship.api to accept 'membership_type' as a param
  http://issues.civicrm.org/jira/browse/CRM-13159
Merge pull request #1411 from davecivicrm/CRM-13159

CRM-13159 add missing period end of sentence and fix unrelated typo spel...
CRM-13199 typo fix.

----------------------------------------
* CRM-13199: UI text wrong spelling?
  http://issues.civicrm.org/jira/browse/CRM-13199
Merge pull request #1412 from davecivicrm/CRM-13199

CRM-13199 typo fix.
CRM-13215
Merge pull request #1401 from yashodha/CRM-13203

CRM 13203
Merge pull request #1415 from yashodha/CRM-13215

CRM-13215
cleaned up membership edit/view to show associated contributions and also notices fixes