[Qt] remove broken OptionsModel::Upgrade()
Merge branch 'staging' of https://github.com/l0rdicon/clams into staging

Conflicts:
	src/qt/optionsmodel.cpp
Merge branch 'staging' of https://github.com/nochowderforyou/clams into staging