build.xml whitespace cleanup
Merge remote-tracking branch 'artForz/dev' into dev