Change imports to the cocoa pods-based paths for version 0.6.
Merge branch 'develop'