Fixed white labels
Merge branch 'feature/ios6_fixes' into develop
More fixes for iOS 6
Merge remote-tracking branch 'origin/develop' into develop