Add mateconf-gsettings-data-convert file
appearance: Set metacity theme if compiz or metacity are running
Changed the ordering that titlebar actions are displayed.

Previously, the ordering of the titlebar actions did not match
the enum ordering in the schema file, which caused the wrong
action to be set.
Merge pull request #28 from cygwinports/master

Add mateconf-gsettings-data-convert file
Preparing for 1.5.3 release.
load inital defaults from theme
fix some warnings
display mate-control-center in menu
windows: Add option to enable compositing manager and fast alt-tab
Merge pull request #32 from NiceandGently/master

fix some warnings
mouse: Fix touchpad scrolling settings
Closes https://github.com/mate-desktop/mate-control-center/issues/34
Sync translations with transifex
default-applications: Fix image viewer icon
Closes https://github.com/mate-desktop/mate-control-center/issues/36
default-applications: Allow to set default terminal emulator
Translated Spanish comments
Fix some small issues
Merge pull request #31 from MDykstra/master

 load initial defaults from theme
Disabled shortcuts have "disabled" as value in GSettings, not an empty string
Merge branch 'master' of github.com:mate-desktop/mate-control-center
Disabled shortcuts have "disabled" as value in GSettings, not an empty string
keybindings: Dont use removed GSettings allowed-keys
Bump version to 1.5.4