raise error asis
improve text node handling
Merge branch 'master' into develop

Conflicts:
	bin/bs2xml