Added new parameter TrialPublic
Print only the error message. Also print trial data to stdout
Adding '/dictionaries' to .gitignore
Merging two select changes from 'carlos'
Merge remote-tracking branch 'origin/master' into carlos

Conflicts:
	spreadsheet-processor/src/main/java/org/cabi/ofra/dataload/Main.java
	spreadsheet-processor/src/main/java/org/cabi/ofra/dataload/impl/DefaultTemplateProcessor.java
	spreadsheet-processor/src/main/java/org/cabi/ofra/dataload/model/IProcessingContext.java
	spreadsheet-processor/src/main/java/org/cabi/ofra/dataload/model/ITemplateProcessor.java
	spreadsheet-processor/src/main/java/org/cabi/ofra/dataload/specific/TrialDefinitionTemplate.java
Merge branch 'carlos'