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`
Not sure who to ask about this one, maybe @jleandroperez or @astralbodies?