fixed up small errors with tags etc.
Merge remote-tracking branch 'origin/master' into live
Re-generated page html content