Merge pull request #617 from anandpdoshi/anand-wip

Don't clear Naming Series property setter when resetting customization
hotfix: remove user_roles where parentfield is blank
Fixed Data Import for Children