user-import additional-fields

This allows to provide additional csv columns in user_import
and use them for replacing {0}, {1}, ... in the invitation mail
Fixup, in case there aren't additional fields
Merge pull request #582 from xi/feature-user-import-additional-fields

user-import additional-fields