Cleaned and checked trial upload
Merge commit '0f419ece9bd5b73f9103e131eee162cbe69ea0d4' into first-release

Conflicts:
	.idea/workspace.xml
	spreadsheet-processor/src/main/java/org/cabi/ofra/dataload/db/impl/TrialDao.java

Conflicts resolved. Need to remove workspace.xml again