new condition editor
new condition editor
new condition editor
fix conflict
improve condition editor with address filter
little fix
condition editor find device name
fix merge conflict