Ready for release

Removed comments, fixed escaping in span elements.
Ready for release
Ready for release

removed test template