Merge branch 'v2.1.5' into testing
查看被删除的笔记相关消息时，进行信息提示。
modify for macos 10.9.x
Merge branch 'macos-10.9.x' into v2.1.6
package shell for mac os 10.9.x
Merge branch 'v2.1.6'