modify makefile for ant build
test
modify makefiles tar.gz
test
test2
test3
test4
test5
Merge branch 'master' into develop