omg
Merge branch 'master' of https://github.com/Canfly/amalgama

Conflicts:
	app/views/shared/_right_sections.html.haml
	config/locales/diaspora/ru.yml