billingAddress

billingAddress branch and some modifs to master (e9356bc, 83c51f6)