Merge branch 'master' of https://github.com/molgenis/molgenis
Csv-reader can now also deal with separators other than comma and tabs (e.g. semi colon)
Merge branch 'master' of https://github.com/molgenis/molgenis
update elasticsearch 0.90.7 to 0.90.13 (which updates lucene 4.5.1 to 4.6.1)
For MolgenisUser: changed field 'middle initial' into 'Middle names' (can be used for voor-/tussenvoegsels as well as for middle names).
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