Release 4.5 to develop

Solved several conflicts, but there are still some to go.  I will point them out inline.

Also @astralbodies, these files had a conflict and I just checked out the `develop` ones:

`WordPress/Classes/WordPress.xcdatamodeld/WordPress 22.xcdatamodel/contents`
`WordPress/Classes/WordPress.xcdatamodeld/WordPress 23.xcdatamodel/contents`
I can't see anything changed in 4.5, so I'd pick the PostService part: https://github.com/wordpress-mobile/WordPress-iOS/blame/release/4.5/WordPress/Classes/ViewRelated/Post/PostsViewController.m#L297