API TransactionSubscriber - Rollback on soft errors (as well as exceptions)
partial fix on membership type's stompiness on updates to test pr
--HR-350 Add parameter for extra whereClause to getRows() function
CRM-15105 add test to demonstrate + fix other tests to use
create rather than update so we are not encouraging use of update action
CRM-15105 fix for erroneous setting of status
HR-405 CSS changes for icon overlay display
CRM-15113 don't redirect if rgid is not filled in  - otherwise you wind up at an unfiltered dedupe calculation screen
CRM-15113 - adding a refresh where the redirect would otherwise be causes the user to wind up back on the search page and to get the alert
Merge pull request #3831 from eileenmcnaughton/CRM-15105

Crm 15105
Fix issue with reports creating invalid URLs when updated.

When updating a report, if the Report Settings is set to "Include Report in
Navigation Menu", the navigation url that is created is formatted like
/civicrm/report/instance/1_reset_1, which is incorrect. The correct URL
should be /civicrm/report/instance/1?reset=1.
Revert "Fix DAO to properly enforce desired collation"
PriceSet help text improvement
Merge pull request #3860 from colemanw/PriceSet

PriceSet help text improvement
CRM-14830 - Email tpl cleanup and removed unused function
Merge pull request #3862 from colemanw/CRM-14830

CRM-14830 - Email tpl cleanup and removed unused function
Merge pull request #3858 from giant-rabbit/feature/reports-nav-url-fix

Fix issue with reports creating invalid URLs when updated.
Membership js fix to work in popup
Auto-resize dialog to fit content
Merge pull request #3863 from colemanw/Auto-resize

Auto-resize dialog to fit content
msg-template layout fix