update the app icon, other pages.
Merge remote-tracking branch 'origin/master'