src jar ant task
Merge branch 'src-jar' into dev

Conflicts:
	build.xml