Refactored: moved to addon
Merge branch 'BRANCH_PLATFORM_5' of git+ssh://github.com/idega/com.idega.company into jarfalla