Added the option to show the remaining time *and* the percentage
Use primary device for main label

This is a fix for laptop users with more than one battery where the main label would report data for a random battery instead of the battery total.
Add styleclass names
Fix sound settings to make more sense
Merge pull request #3025 from collinss/sound-applet-settings

Fix sound settings to make more sense
Merge pull request #2665 from blockcoder/patch-1

[2.2] Added the option to show the remaining time *and* the percentage
Merge branch 'patch-1' of https://github.com/zirgon/Cinnamon into zirgon-patch-1

Conflicts:
	files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js
Moved power applet to settings API
Removed obsolete gsettings schema/key
Merge pull request #2854 from collinss/menu-theme-fix

[2.2] Menu theme fix
Calendar applet: Don't use clock during suspend
Network applet: Support modemmanager1, signal strengh on mobile broadband devices
HotCorner module: Fixed custom entries showing up all the time
Fix build break from multi-arch patch in muffin:

https://github.com/linuxmint/muffin/commit/348b71354a23f5f512c4879c455d679a0a972a69
Add mousewheel actions to window titlebars.  Options are nothing (default),
shade/unshade, and adjust opacity.
Add keybindings to adjust window opacity
rework the panel context menu a change a couple of icons
Merge pull request #3035 from JosephMcc/panel-context-menu

rework the panel context menu a change a couple of icons
Makepot
2.2.0