Mysql, EMX, validation
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-data-mysql/src/main/java/org/molgenis/data/mysql/MySqlConfiguration.java
	molgenis-data-mysql/src/main/java/org/molgenis/data/mysql/MysqlRepositoryCollection.java
	molgenis-data-mysql/src/test/java/org/molgenis/AppConfig.java
	molgenis-omx-importer/src/test/java/org/molgenis/omx/importer/OmxImporterServiceTest.java
Fixes for merge, transactional,missing css file
Make app start again
Merge pull request #1813 from erwinwinder/master

Mysql, EMX, validation
merge with molgenis master