#vt-55 Fixed work 4h
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	app/models/social/voter.rb