We should be checking in the Cocoapods, otherwise you'll be installing them all the time
Merge branch 'master' into display-a-bar