Update project with the latest changes from e4ds-template