Changes due to private group
Version 5
Merge branch 'BRANCH_PLATFORM_5' of github.com:idega/fiskistofa into BRANCH_PLATFORM_5

Conflicts:
	pom.xml