Fixed state restoration.
Updates the podfile.lock.
Completed an incomplete comment :).
Fixes the bottom bar not being hidden sometimes.
Merge pull request #2859 from wordpress-mobile/issue/editor-417-fix-state-restoration-2

Fix state restoration.
Shows an alert if the user opens in preview mode a post with unsaved changes.
Integrates the editor pod version v0.2.3.1.
Merge pull request #2868 from wordpress-mobile/editor-integrate-latest

Integrates the editor pod version v0.2.3.1.
Merge pull request #2867 from wordpress-mobile/issue/editor-426-show-alert-for-unsaved-changes

Shows an alert if the user opens in preview mode a post with unsaved changes.
Removes call to layoutSubviewsIfNeeded when a media bach loads.
Merge pull request #2871 from wordpress-mobile/issues/2869-do-not-force-layout

Removes call to layoutSubviewsIfNeeded when a media bach loads.
Updating the editor pod to point to the latest commit in branch 0.3.
Merge pull request #2877 from wordpress-mobile/editor-4.7-integrate-latest

Updating the editor pod to point to the latest commit in branch 0.3.
Merge branch 'release/4.6' into issue/pull-missing-4-6-changes-to-4-7

Conflicts:
	Podfile
	Podfile.lock
	WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.m
	WordPress/Classes/ViewRelated/Post/WPPostViewController.h
	WordPress/Classes/ViewRelated/Post/WPPostViewController.m
	WordPress/Classes/ViewRelated/Reader/CommentContentView.m
	WordPress/Classes/ViewRelated/Reader/ReaderCommentsViewController.m
Fixed merge conflicts in WPPostViewController.
Removed an auto-merge problem in WPPostViewController.
Merge triage.
Fixes NotificationDetailsViewController conflicts
Merge pull request #2885 from wordpress-mobile/issue/pull-missing-4-6-changes-to-4-7

Pull missing `release/4.6` changes into `release/4.7`
Merge branch 'release/4.7' into issue/merge-release-47-to-develop

Conflicts:
	Podfile
	Podfile.lock
	WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.m
	WordPress/Classes/ViewRelated/Post/WPPostViewController.m

Unresolved
	WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.m