removed user config file loader
Merge branch 'develop' into testing