added folder to organize config files
Merge branch 'master' into jenkins