change

change
Merge branch 'awakeel_7.0' into _MEE
add/edit dialog block