Bug fixes
Merge branch 'master' of git+ssh://github.com/idega/com.idega.company into BRANCH_PLATFORM_5

Conflicts:
	src/java/com/idega/company/business/impl/CompanyServiceImpl.java