saving changes in Worksheet.ftl before merging form master
commit before merging conflicts
BarcodeSelector uses values form database instead from file
Deleted comments in BarcodeSelector
Fixed barcode selector only uses selected barcodes, but found newly intorduced bugs due migration to Spring MVC
Merge branch 'master' of https://github.com/molgenis/molgenis
Deleted not used javascript.
Merge pull request #773 from burgerm/master

BarcodeSelector works with values from the database instead of file