Using E36 file
Merge branch 'BRANCH_PLATFORM_5' of github.com:idega/is.idega.block.nationalregister into BRANCH_PLATFORM_5

Conflicts:
	src/java/is/idega/block/nationalregister/business/ImportFromFileServices.java