Merge branch 'Issue/5-colors' into develop
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPress-iOS-Shared into develop