! version 2.12 RC1

Conflicts:
	res/xml/preferences.xml