Merge branch 'hotfix_import_characters' into payout_split_fees

Conflicts:
spec/models/period_spec.rb
Revert "Merge branch 'hotfix_import_characters' into payout_split_fees"

This reverts commit 4e74934186b3a0135b0596010d30a1b9654526da.