add/refresh functions from mapproxy to load datasources
removed duplicate code
fixed import
Merge branch 'master' into HEAD