merged www/ from dev
minor changes to the spec template