changes

changes
Merge branch 'awakeel_6.7' into _MEE
link small dialog