HOTFIX 2016.1, 2015.6, 2015.5 - Added ##ORDERBILLINGADDRESS## and ##ORDERBILLINGADDRESSHTML## merge codes.

Added ##ORDERBILLINGADDRESS## and ##ORDERBILLINGADDRESSHTML## merge codes that can be used within an order context.

(##ORDERSHIPPINGADDRESS## and ##ORDERSHIPPINGADDRESSHTML## merge codes already exist!)