resources and customer
added master data
Merge branch 'dev'