Fix test
Fix upload of entities only (without metadata)
Adding new attribute during import for MysqlRepository
LabelAttribute EMX
Typo
move resources from /webapps to /src/main/resources
remove test css
fix resources url
Xref/mref/categorical show label attr, not id attr
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #1805 from bartcharbon/feature/virtualRepository

move resources from /webapps to /src/main/resources
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/test/resources/example_emx.xls
Remove double ;
Merge pull request #1802 from erwinwinder/master

Add new attribute during import mysqlrepository (transactional)
merge with molgenis master