Merge pull request #1816 from Mark-de-Haan/master

Fix typo. Javascript solution to prevent readonly attributes to be edited
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/indexingrepo
Merge pull request #1818 from dennishendriksen/feature/indexingrepo

Fix xref/mref indexing, meta data handling refactoring
merge with master branch
Merge branch 'feature/package' of github.com:Mark-de-Haan/molgenis into feature/package
removed omx-mobile dependancy from app-omx pom. Fresh clones failed to build because of missing dependancies.
Merge pull request #1820 from Mark-de-Haan/master

removed omx-mobile dependancy from app-omx pom. Fresh clones failed to b...
Bootstrapified the upload button. Styled the surrounding elements. Added bootstrap.file-input.js. Added closing div that was missing. Added two jQuery commands to molgenis-wizard.js
Fixed dataset delete layout. Fixed bug where data-placeholder was not shown. Dropdown now has a width of 80%, preventing it being squished into a small box. Fixed checkbox position.
Merge branch 'master' of github.com:molgenis/molgenis into feature/bootstrap
Refactor importer
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/test/resources/emx_all_datatypes.xlsx
	molgenis-data-mysql/src/main/java/org/molgenis/data/importer/EmxImportServiceImpl.java
Fix test
Fixed:
- layout of two anchors -> btn-default style
- hide catalog pager if only one page
- clear-button of search box in catalog
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/virtualRepository

                                 Conflicts:
                                 	molgenis-data-elasticsearch/src/main/java/org/molgenis/data/elasticsearch/ElasticsearchRepositoryDecorator.java
                                 	molgenis-search-elasticsearch/src/main/java/org/molgenis/elasticsearch/index/MappingsBuilder.java
                                 +bugfix for filter wizard (#1815)

+ refactor repository merger
+unittest repository merger
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/virtualRepository
Removed unused parameter from VCF import function
fixed bug in geneticRepositoryMerger
Improve formatting and fix validation of input elements

Glue the * to required field labels.
Don't use class attribute for validation. Use
data-rule-[date|datetime|url|number] and required attributes instead.
Fixes #1822
Put hidden input fields below the controls they're linked to so that the
validation messages appear below the controls.
Change input type of EMAIL fields to "email".
EmxImportServiceImpl improvements
fixed central form factory by adding missing html close elements and changing structure