Merge branch 'notebook' into desktop

Conflicts:
	boot/grub/grub.conf
	check_diff
	etc/fstab
	etc/portage/make.conf
	etc/portage/package.keywords
	etc/portage/package.mask
	etc/portage/package.use/general
	home/.fluxbox/apps
	home/emersonmx/.fluxbox/init
	home/emersonmx/.fluxbox/menu
	home/emersonmx/.fluxbox/startup

Signed-off-by: Emerson Max <emersonmx@gmail.com>
Atualização dos arquivos para a configuração do desktop.

Signed-off-by: Emerson Max <emersonmx@gmail.com>