Manual merge of DataEntryForm.java (@Freek: kindly let me know in case
of inconsistencies with your branch)
Edited TODOs in Main.java and ReportReader.java
Merge branch 'master' of https://github.com/CTMM-TraIT/trait_proteomics_qc_tool.git