add auto-raise option
cinnamon-settings-users: use pkexec instead of gksu
add pointer size slider
Use button press instead of release events to activate applet, desklet, panel popups
Port Lock screen dialog to GTK+ 3
Added option to display user name on panel

Added settings-schema
Re-rorganized panel context menu

Removed old code
Merge branch '14' of github.com:RavetcoFX/Cinnamon
Evil, whitespace and tabs are.
Merge pull request #2569 from City-busz/pkexec-users

cinnamon-settings-users: use pkexec instead of gksu
Merge branch 'user1' of github.com:RavetcoFX/Cinnamon
user applet: Remove context menu entries that are duplicated in the panel
menu.
user applet: Fix user name not displaying on startup
windows-quicklist applet: Allow animations when switching workspaces
Fixes #2815
Merge pull request #2685 from leigh123linux/patch-11

add pointer size slider
main.js: Initialize the settings manager before the extensions system
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/ui/panel.js
	js/ui/windowManager.js
Merge pull request #2799 from City-busz/gtk3-lock-dialog

Port Lock screen dialog to GTK+ 3
fix merge
Merge pull request #2423 from leigh123linux/patch-7

[2.2] add auto-raise option