mark as merge
Merge branch 'master' of https://github.com/genericsystem/genericsystem2011.git
Layout of editing for attributes.
Text of implicit filter.