Merge pull request #959 from bartcharbon/master

fixed double feature in one protocol
Remove derelict code
Merge pull request #960 from bartcharbon/master

made genomebrowser plugin url, used to get data for table underneath the
Removed old entity and some unused classes
Implement #957 Tokenize on dots (as well as whitespace characters)
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #961 from dennishendriksen/master

Implement #957 Tokenize on dots (as well as whitespace characters)
update 0.0.4-SNAPSHOT to 1.0.0-SNAPSHOT
Merge pull request #962 from dennishendriksen/master

Update 0.0.4-SNAPSHOT to 1.0.0-SNAPSHOT
Remove QueryJoinRule
update 0.0.3-SNAPSHOT to 1.0.0-SNAPSHOT
Merge pull request #963 from dennishendriksen/master

Update 0.0.3-SNAPSHOT to 1.0.0-SNAPSHOT
Move code back to molgenis-data
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-data-csv/pom.xml
	molgenis-data-excel/pom.xml
	molgenis-data-jpa/pom.xml
Fix test
Version nr
Version nr
#2150
Merge pull request #965 from jjettenn/master

#2150
Merge pull request #964 from erwinwinder/master

Removed unused code and moved data code back to molgenis-data