comment all __IPHONE_6_0 macros
Merge remote-tracking branch 'origin/master'