Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Change password flow
Add token form
Add attributes
Added description
Make Jenkins happy
Merge pull request #1489 from dennishendriksen/master

Update elasticsearch 0.90.7 to 0.90.13 (updates lucene 4.5.1 to 4.6.1)
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix for issue #1451
Remove System.out
Fix issue#902
Hide manage tab when user hasn't write permission
* Added DiseaseMatcher layout to DataExplorer
* Added RunTimeProperty to show/hide DiseaseMatcher (false by default)
* Updated jquery.bootstrap.pager.js to prevent default behaviour of bumping to top of page on click
* Added cmd tool to combine disease-gene-phenotype files and prepare for upload as DiseaseMapping model
* Added diseasematcher test data set
* Disease list now lists diseases based on data explorer query
* Added pager for disease list
Removed console.log
Merge pull request #1494 from tommydeboer/master

Added DiseaseMatcher prototype
Merge branch 'master' of https://github.com/molgenis/molgenis
Change columnnames for GenomeBrowser to VCF standard. + genome browser bugfixes
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/java/org/molgenis/dataexplorer/controller/DataExplorerController.java
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/java/org/molgenis/dataexplorer/controller/DataExplorerController.java