Added a try/catch to fix an uncaught exception in the salesforce queue config page.
Style fixes plus a notice fix.
Adjusted my fix to behave like salesforce genmap when not connected to salesforce.
Merge branch '7.x-4.x' into 7.x-4.x-743-salesforce_queue_crash
Updated direct market source field behavior to use the original value when no new value is provided.
Merge pull request #460 from JacksonRiver/7.x-4.x-714-direct_market_source

Upsell direct market source behavior
added support for CDN image url updating in rendered templates, input filters are now run when rendering a page wrapper template.
added some tweaks to ensure php is filtered when Full HTML is selected
Fixed the queue admin theme function to skip theming the form if we can't connect to Salesforce.
Added token support for html & text template fields.
Added a check so that direct market source fields don't use url overrides for upsell.
Merge pull request #466 from JacksonRiver/7.x-4.x-879-token_replacement_in_email_template

Added token support for html & text template fields.
Merge pull request #465 from JacksonRiver/7.x-4.x-page_wrappers_apply_node_filters_to_template

Add CDN support for assets embedded in page wrapper templates
Merge pull request #406 from JacksonRiver/7.x-4.x-743-salesforce_queue_crash

Prevent fatal error when accessing the Salesforce queue config page when not connected to an org
Removed an extra period from a comment.
* Implementing hook_tokens_alter in fundraiser_webform to add global donation token support on a webform confirmation
* Implementing hook_tokens_alter in fundraiser_commerce to add support for the order and transaction tokens
Merge pull request 472.

Merge branch '7.x-932-donation-tokens-on-webform-confirmation' into 7.x-4.2.5