Merge remote-tracking branch 'origin/h2-gentoo-danil' into h5-ubuntu-danil
Merge remote-tracking branch 'origin/h2-gentoo-danil' into h5-ubuntu-danil

Conflicts:
	.config/Trolltech.conf
Merge remote-tracking branch 'origin/h9-gentoo-danil' into h5-ubuntu-danil
emacs cider 0.8.2 bump
FIX: emacsclient alias
Merge remote-tracking branch 'origin/h5-ubuntu-danil' into h9-gentoo-danil

Conflicts:
	.config/autostart/xchainkeys.desktop