I made necessary edits
.travis.yml
necessary to depend on wx mod indirectly when running test code
eos\config.py
copy from development branch, This change was necessary when using data base in test code.
service\settings.py
copy from development branch.
and modified SettingsProvider.getSettings and Settings.save.
After that, we made the same as master branch except for necessary code.
This change was necessary when using data base in test code.
and other improvement.
