fixed NA/NULL handling in strings
fixed merge conflict

Merge branch 'master' of https://github.com/SwedishPensionsAgency/translater

Conflicts:
	R/translate-object.R