Detail view toolbar icons, header clean up and formatting

Added toolbar icons in normal/active states, cleaned up and simplified
the top of the view and increased padding throughout.
Merge branch 'reader' of https://github.com/aerych/WordPress-iOS into reader

Conflicts:
	WordPress/Classes/ReaderPostDetailViewController.m
Fixing up detail view styling again

Padding + fonts + colors + math to render it all.
Removing obsolete merge files.
Merge branch 'reader' of https://github.com/aerych/WordPress-iOS into reader
Removing obsolete merge files.
Some font/styling changes to the detail view

To increase readability and keep it consistent. Unfortuantely breaks
images/media (now misaligned, most likely because there's a new
line-height - we need a global line-height size!)
Restoring changes that were clobbered via an earlier merge. Tries to retain relevant other changes.