DF-185 added screen width 1080 for iphone6
DF-185 added screen width 1080 for iphone6 plus for iphoneos7.1
DF-185 on iphoneos7.1 for iphone 6 plus width is 828
Merge branch 'to_master_ios' into to_master