allow template names to be asset specs and add a note about password fields to CHANGES
fix merge conflicts