Minor fixes (i18n, xlsx)
Merge branch 'dev-nd'

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