fix
Merge branch 'rails2-4' of https://github.com/we-b/mooovi into rails2-4

Conflicts:
	app/views/users/registrations/new.html.erb