Merge branch 'frink-gentoo-danil' into h3-arch-danil
Merge branch 'h3-arch-danil' into h6-gentoo-danil

Conflicts:
	.config/gtk-3.0/settings.ini
	.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml