A note for future.
Merge branch 'DF_multifield' of github.com:flow123d/flow123d into DF_multifield

Conflicts:
	src/fields/field.hh