...
Merge branch 'master' of https://github.com/susannej/pcbsd

Conflicts:
	lumina/lumina-desktop/panel-plugins/battery/NOTES
added charging state