Refactored data structures
Merge branch 'master' of git+ssh://github.com/idega/com.idega.xroad into BRANCH_PLATFORM_5