TC: Reformatted flickr links in html comment
TC: trying to fix conflict
RobL: tweaks
RobL:copy updates