#426 fixes for templates and modal
Update adding/editing customers to look for line1/line as well as street_address, look for state as well as region. Fixes #483 and fixes #465