Tray Functionality
Fixed editing empty and null Strings.
Merge remote-tracking branch 'origin/jiashun'