wordpress-mobile/WordPress-iOS — pull request #2673 by diegoreymendez (2014-10-28 22:01:11+00:00)
Title: 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`