merge taxeditor validation2 into trunk