Cleaning configs
Merge branch 'develop' into asset
Merge branch 'asset' into user