Issue #2019 fix. Tied labels to their respective controls
Changes admin modal display for email templates to take advantage of more of the screen.
Fixes bug in smartlist and resetting cache keys
Updated Version 3.1.57.141
Updated Version 3.1.58
Merge branch 'master' into develop

Conflicts:
	version.txt
Fix to mod10 validation to check for null property values
Added billing address info to order payments on checkout template
Added billing address information on detail order payment
Update OrderDelivery_Create.cfc

Math/logic was messed up for partial fulfillment deliveries. Wasn't taking into account tax, and was multiplying the entire line-item total by undelivered qty / current delivery qty..  Eg: 10 undelivered / 5 on this delivery =2 * the row total (10x the sku price)= too much.

Now it's simply:  line-item subtotal including discounts and tax / by the qty on the line * the qty on the delivery.  So: price including discounts and tax per qty 1 * the delivery qty.
Small Logic Flow Change
Fixes possible encryption key location issue.
Merge remote-tracking branch 'origin/feature-billingAddressOrderPayment' into feature
Small Updates to Jacobs Billing Address fix
Merge remote-tracking branch 'origin/feature-billingAddressConfirmation' into feature
Updated Version 3.1.58.142
Added config file to ckfinder to store the application name
Added ability to sort shipping method options by price or shipping
method sort order
Updated Version 3.1.58.143
Fixes typo in latest version