Launch images for iPhone 3.5 and 4
Merge remote-tracking branch 'origin/master'