Added handlebars helper to convert duration to a timestamp.
Fixed conflicts.