修改app图标和启动图片
Merge remote-tracking branch 'origin/master'