Replacing regexp assertions by XML node navigation.
Reformatting HTML template files (2 spaces indentation).
Merge pull request #27 from damage-control/replace-regexp

Replace regexp