Fixing bugs
Merge branch 'feature/social_bugs_fix_79' into staging

Conflicts:
	app/assets/stylesheets/application.css
	config/locales/activerecord.ru.yml