icon and splash screen update
Merge branch 'master' into splashScreenFix