Fix license header
Add User list tests and ability to filter on customer_id
Add merchant_id and add Users to Customer