remove app_tray
update CMakeLists.txt
Merge branch 'develop'