iOS 7 fixes.
Fix icons
Fix conflicts
Final commit
Final fixes for 1.2.0