Merge branch 'master' of https://github.com/molgenis/molgenis
Added a check in the CADD annotator to see whether a minor major allele swap has occurred
Also (locally) fixes cadd values not being added to the data set
Removed the molgenis-variome folder. This was an early implementation of the annotation module.
Merge pull request #1485 from Mark-de-Haan/master

Added a check in the CADD annotator. molgenis-variome folder removed
update elasticsearch 0.90.7 to 0.90.13 (which updates lucene 4.5.1 to 4.6.1)
Merge branch 'master' of https://github.com/molgenis/molgenis
Change password flow
Add token form
Add attributes
W.I.P complex filters.
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
W.I.P
Complex filters
Merge branch 'master' of github.com:molgenis/molgenis