Commented out "proxy selection test" demo page in user settings
Merge branch 'master' of https://github.com/graffy76/openmw
fixed conflict

Conflicts:
	apps/opencs/model/settings/usersettings.cpp