merged userBillingAddres feature with master (and deleted ~ files)
Merge branch 'master' of https://github.com/mzaharie/charlie