Bug fix
Merge branch 'BRANCH_PLATFORM_5' of https://github.com/idega/com.idega.xroad.client into BRANCH_PLATFORM_5

* 'BRANCH_PLATFORM_5' of https://github.com/idega/com.idega.xroad.client:
  Using code from ver. 5

Conflicts:
	src/java/com/idega/xroad/client/business/impl/XRoadServicesImpl.java