— different assets for iPhone 4 & 5
Merge remote-tracking branch 'origin/master'