Small fixes
Merge branch 'master' of github.com:idega/is.idega.idegaweb.egov.company into BRANCH_PLATFORM_5