Merge branch 'master' into staging
fix
fix assets
fix users
add new customer
Merge branch 'staging'