fixed iphone 5 camera
Merge remote-tracking branch 'origin'