IOS 7 fixes
Merge branch 'develop'