API TransactionSubscriber - Rollback on soft errors (as well as exceptions)
Update Participant.php

Removed 3 instances of assignment in if operators. This is ambiguous and against the Civi coding standards.
Refactored ParticipantListing.php

1) Commuted assigns in if statements into assigning, then checking, as otherwise fails code validators and breaches CiviCRM coding conventions.

2) Refactored repeated code found while repairing those errors into a separate reusable function that accepts parameters. I only did this where the code was identical. Where there was any distinction I didn't do this to prevent introducing bugs.

https://issues.civicrm.org/jira/browse/CRM-14434
CRM-14946 add relevant test data set
CRM-14995 contributions disappearing on pledge edit

Conflicts:
	CRM/Pledge/Form/Pledge.php
CRM-14995 tidyups
fix inconsistent return value from fn
putting this in the queue when I remember as deep in something else but it fixed a fatal on off-site payment processor
CRM-12370 - add extension modules immediately after civicrm drupal module.

----------------------------------------
* CRM-12370: CRM_Utils_Hook::requireCiviModules() assigns infinite weight to extensions
  https://issues.civicrm.org/jira/browse/CRM-12370
CRM-15035 include/exclude - set tag defaults
CRM-15036 - force emailed social media image URLs to use HTTP.

----------------------------------------
* CRM-15036: Social media image URLs should always use HTTP in emails
  https://issues.civicrm.org/jira/browse/CRM-15036
CRM-15032 - change 4.4.0.mysql.tpl to UTF-8 encoding
CRM-15021 Web Test Fix
Notice Fix during test execution
Fix for assertion of status message for deletion of case type when in use.
Finish migrating AlternateContactSelector.js to use entityRef
Merge pull request #3740 from colemanw/acs

Finish migrating AlternateContactSelector.js to use entityRef
Merge pull request #3738 from jitendrapurohit/CRM-15021

CRM-15021 Web Test Fix
Merge pull request #3681 from eileenmcnaughton/CRM-14995

CRM-14995 contributions disappearing on pledge edit
CRM-14997 - fix regression that caused Add Contacts to Group button to be ALWAYS hidden.

----------------------------------------
* CRM-14997:
  https://issues.civicrm.org/jira/browse/CRM-14997
Merge pull request #3741 from davecivicrm/CRM-14997

CRM-14997 - fix regression that caused Add Contacts to Group button to b...