before pull
Merge branch 'vetal-develop' into vetal-develop

Conflicts:
	app/views/admin/registrations/index.js.erb
clean up