Improved ant build script: added replacing tokens.
When finding version, look for the last tag on the branch "master"
Merge commit '55c5238e501ee809116ed83a01ae6280f57a286b' into test
Merge branch 'master' into test

Conflicts:
	test/hunternif/mc/atlas/TestGit.java