Fix bug
Add iPhone6 and 6Plus
Merge remote-tracking branch 'upstream/master'