added encoding to javac task in ant
Merge remote-tracking branch 'origin/master'