Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #1263 from erwinwinder/master

Fix upload zip file containing csv files
Merge branch 'master' of github.com:molgenis/molgenis
Fix #1273 Rest API does not resolve categorical references
Merge pull request #1274 from dennishendriksen/master

Fix #1273 Rest API does not resolve categorical references
fix #1275 Model field type categorical broken
Merge pull request #1276 from dennishendriksen/master

Fix #1275 Model field type categorical broken
Merge pull request #1279 from erwinwinder/master

Keep attribute order during import
Fix NullPointerException in HitRefEntity.java
BugFix #1272 work in process
Merge branch 'master' of github.com:molgenis/molgenis
Fixed #1272 split function in charts works
Merge pull request #1280 from jjettenn/master

Fix GitHub Issue #1272
Fix issue #794. Better errormessage on duplicate mref.