adding configuration source and file
Merge branch 'dev'