Fix MateConf convert file
Fix panels issue when user has two separate X screens
Closes https://github.com/mate-desktop/mate-panel/issues/87
Closes https://github.com/mate-desktop/mate-panel/issues/89
clock: Allow users to set custom format in dconf-editor
Merge remote-tracking branch 'upstream/master'