plug the conflict detector and revision browser in EditPostViewController
Merge branch 'ticket-1498' of github.com:maxme/WordPress-iOS into ticket-1498