#vt-59 Fixed work 1h20m
Merge remote-tracking branch 'origin/master'
#vt-60 Fixed work 1h30m
rm fill up for users
Merge branch 'master' into develop

Conflicts:
	app/models/other_voting.rb
	db/schema.rb