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

Conflicts:
	.gitignore