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
Set font-size to see text (was font-size 0)
Moved bootstrap-datetimepicker to core-ui
Use same tablecell formatting in dataexplorer and forms
Fixed bug that on create subform the back uri was not appended to the link
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
Merge branch 'master' of https://github.com/molgenis/molgenis
Deleted not used javascript.
first commit of spring based security
second commit of spring security
temporarily remove file download/upload services
remove test
fix tests
third commit of spring security
finalize plugin permission manager
fix test
fix test