Merge pull request #125 from flamingo-geocms/feat/edit-feature-condition

Feat/edit feature condition
Merge branch 'master' into feat/solrsearch