notification applet:  fix problems when removing and readding, or
moving to a different panel location.

General rearranging of some code to behave a bit better
Cinnamon Settings: Remove now-unnecessary "Always show location
entry in Nemo" option.
Add gnome-mplayer to list of supported audio players
Merge pull request #1626 from askuhn/master

Add gnome-mplayer to list of supported audio players
Merge pull request #1617 from mtwebster/remove-location-entry

Cinnamon Settings: Remove now-unnecessary "Always show location entry in Nemo option
Added support for cinnamon-screensaver
Improved focus order and usability in cinnamon-screensaver-lock-dialog
Fixed menu launching screensaver-dialog
Include desklets in makepot
Merge pull request #1604 from Lusito/rolefix

Fix for roles not being honored after applet manager revamp
Merge pull request #1245 from mtwebster/notifications-readd

notification applet:  fix problems when removing and readding, or
Merge remote-tracking branch 'upstream/master'

Conflicts:
	files/usr/share/cinnamon/applets/notifications@cinnamon.org/applet.js
	files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js
[Alt-tab] Outline the window that currently has focus (2).
[Alt-Tab] Size the icons according to the number of windows on the current workspace (fix for the case when the current workspace is empty).