fixed a syntax error in consolidate_tei.
Fixed merge conflict.
Updated tree logic.
Merge pull request #12 from MorganDawe/7.x.publish_viewer

Fixed syntax error