Fixes issue #584.
Merge remote-tracking branch 'upstream/master' into issue-584-scrollview-position
Re-implemented the fix:
- Fixes distorted subviews and positioning in both BakerViewController and IndexViewController
- Apparently, UINavigationController likes to mess with subviews when app becomes active
- Adjusting subviews based on UIApplicationDidBecomeActiveNotification does not help as the changes happen at a later time (BTW, viewDidAppear does not get called again)
- Doing the same in viewDidLayoutSubviews works nicely as it's called after UINavigationController is already done
Merge remote-tracking branch 'upstream/master' into issue-584-scrollview-position
Merge remote-tracking branch 'upstream/master' into issue-584-scrollview-position

Conflicts:
	BakerView/BakerViewController.m
Fixed conflict
Improved fix for issue #584
Merge pull request #675 from waywalker/issue-584-scrollview-position

Fixes issue #584.