Updating pods after merge
Merge remote-tracking branch 'canonical-github/develop' from https://github.com/wordpress-mobile/WordPress-iOS into develop
Merge remote-tracking branch 'develop' from https://github.com/wordpress-mobile/WordPress-iOS into develop

Conflicts:
	Podfile.lock
	Pods/Manifest.lock
	Pods/Pods-WordPressTest-resources.sh
	Pods/Pods-WordPressTest.xcconfig
	Pods/Pods-resources.sh
	Pods/Pods.xcconfig
	Pods/Pods.xcodeproj/project.pbxproj
Merge remote-tracking branch 'develop' from https://github.com/wordpress-mobile/WordPress-iOS.git into develop
Merge branch 'develop' of github.com:Automattic/WordPress-iOS into develop
Fixes an issue where wpcom.mobile_push_unregister_token was never called upon logout. (Do the sign out from wpcom, and then remove the account on the device).