Form part 2
Conflict solved
Filter form1 add fields
Merge branch 'master' of https://github.com/gTpopov/reester