Optimized imports (AppCode)
Merge branch 'feature/iOS6' into develop

* feature/iOS6:
  Optimized imports (AppCode)