Merge branch 'h3-gentoo-danil' into h5-ubuntu-danil
Merge branch 'h6-gentoo-danil' into h5-ubuntu-danil

Conflicts:
	.Xresources
emacs company mode fire after two characters
minor
emacs company sort by occurrences
emacs company mode for comint mode (sql mode)
Merge branch 'h5-ubuntu-danil' into h6-gentoo-danil