Changes admin modal display for email templates to take advantage of more of the screen.
Added custom attributes to order fulfillments and order deliveries
Cleaning up delivery items tab
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.
Added config file to ckfinder to store the application name
Merge remote-tracking branch 'dzikakis/patch-5' into hotfix
Updated Version 3.1.59
Updated the cart controller to fix the paymentAddress issue
Updated Version 3.1.60
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge remote-tracking branch 'dzikakis/feature-adminmodalemailwidth' into develop
Updated Version 3.1.60.146
Updated addOrderItem validation
Merge remote-tracking branch 'origin/hotfix-addOrderItem' into hotfix
Updated Version 3.1.61
Merge branch 'master' into develop

Conflicts:
	version.txt
Added setSelectDistinctFlag(true) in assignedAttributeSetSmartList
function
Fixed getAssignedOrderItemAttributeSetSmartList() with
setSelectDistinctFlag()
Fixed Sku Attribute SmartList with setSelectDistinctFlag()
Fixes typo