simplified
added iPhone5 default image to suppress warning
Merge remote-tracking branch 'origin/master'
merge version conflicts