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.
Add datetimepicker to date fields
Fix pk formattting
Merge pull request #776 from erwinwinder/master

data inputs for forms
Merge pull request #773 from burgerm/master

BarcodeSelector works with values from the database instead of file
Made genome browser plugin and added it to omx app
fix bug that breaks the catalog when resetting after a order has been
placed
disable buttons after submit in the order dialog
Show spinner while your shoppingcart is being submitted
Merge pull request #777 from bartcharbon/master

LL fix bug that breaks the catalog when resetting after a order has been