fix for glib2-2.41.2
otherwise mate-mouse-properties doesn't start anymore
taken from https://git.gnome.org/browse/gnome-control-center/commit/?id=8251128055c28a8054f41d050ea0a0266a96b72a
remove-segfault-when-more-custom-keybindings-configured
Merge pull request #114 from NiceandGently/master

fix for glib2-2.41.2
Merge pull request #116 from ivancekg/pull-requests

remove-segfault-when-more-custom-keybindings-configured
Update Marco WM name

After https://github.com/mate-desktop/marco/commit/cbf24f5d78719b930fc0cd6c0c80e00e9d62c95a
Make sure we require marco 1.9.1 for the name change
Use Caja GSettings schema optionally

This makes Caja dependency optional. Disable desktop font setting if no Caja present.

Closes https://github.com/mate-desktop/mate-control-center/pull/119
logout key bindings

provided additional "logout" key bindings
Merge branch 'logout'

Conflicts:
	capplets/appearance/appearance-themes.c
	capplets/common/mate-theme-apply.c