several body tag issues
Merge branch 'master' into multidirs
nested body tags issue
Merge branch 'multidirs' into beta

Conflicts:
	ChangeLog