some changes
Merge branch 'dev' of https://github.com/bondo11/ConfigEditor.git