перезд на постгрес
Merge branch 'master' of https://github.com/tataurov/z-fend

Conflicts:
	app/controllers/registrations_controller.rb