Conflicts: gui/builtinPreferenceViews/pyfaGeneralPreferences.py gui/builtinStatsViews/priceViewFull.py service/fit.py service/price.py
Conflicts: gui/builtinPreferenceViews/pyfaGeneralPreferences.py gui/builtinStatsViews/priceViewFull.py service/fit.py service/price.py