template cleanup
updated site URL
Merge commit '5095c411d53b0171c748f449d009d1af73df9826'