Using unified version
Merge branch 'master' of github.com:idega/org.apache.axis into BRANCH_PLATFORM_5

Conflicts:
	.gitignore
	pom.xml