Merge branch 'release/3.7'
Corrected a core data migration crash if the username is empty and also prevent a crash if the password is removed from the keychain
Bumped version to 3.7.1 to support hotfix
Fixing incorrect user id sent to Quantcast.
One additional crash fix for when primary blog ID isn't set and NSNumber compareWithNumber fails passing it nil
Merge remote-tracking branch 'origin/hotfix-3.7.1'
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).
Revert "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)."

This reverts commit 05056f04f4c1afe960e9afebc003511f9fa5ec7e.
Merge branch 'release/3.8'

Conflicts:
	WordPress/Info-beta.plist
	WordPress/Info-dev.plist
	WordPress/Info.plist
Merge branch 'release/3.8.1'
Merge branch 'release/3.8.2'

Conflicts:
	WordPress/Classes/ReaderReblogFormView.m
Merge branch 'release/3.8.3'
Merge pull request #606 from wordpress-mobile/release/3.8.4

Moving Release/3.8.4 into Master
#457 - Fixed failure with unregistering push notifications (fixed in develop)
Merge pull request #766 from wordpress-mobile/release/3.8.5

Merging release/3.8.5 into master
Don't relayout reader views with delay

For some reason, Core Text was giving infinite height to the line
containing the placeholder for a youtube video.

Setting a longer delay also fixed it, but since everything else seems to
work I removed the relayout code.

Fixes #655 for 3.8.6
Revert "Don't relayout reader views with delay"

This reverts commit e85ee60953b66d8d0d2b9733734b584d44f7277a.
Fixes a divide by zero error when laying out videos in the reader detail.
Merge pull request #866 from wordpress-mobile/release/3.8.6-fix-video-crash

Release/3.8.6 fix video crash
Bumping to version 3.8.6