Merge pull request #1647 from dennishendriksen/master

Fix #1646 max one range field can be defined in XML
Fix #1650 Importing categorical attributes broken
Merge branch 'master' of https://github.com/molgenis/molgenis