implementation of FieldBlock as FieldSet
tests for FieldBlock
Merge branch 'master' into field-block-2
fixed bugs caused by FieldBlock changes
Merge branch 'field-block-2'