refactoring
Merge branch 'master' of github.com:irudyak/ant-toolkit-2.0

Conflicts:
	readme.txt