removed config files
Merge branch 'master' into testing

Master updated to lasted stable test.