more fucking layout bullshit
more bullshit
iOS 7 compatibility and iOS 6 compliance
Merge remote-tracking branch 'origin/rewrite_201306' into rewrite_201306