Clean up post details
Resolved conflicts

Conflicts:
	templates/includes/layout/header.jade