User Preferences screen started.
User preferences dialog completed.
Merged from trunk.
merge from lp:~peter-simpson/openpetraorg/dev_0002015_preferences_dialog
uncrustify
merge from lp:openpetraorg