ticket:13 edit test, view
Merge branch 't13_customer'