12121
Merge branch 'temp3' into temp2

Conflicts:
	settings.cpp