Bug fixes and refactoring
Bug fix
Fixed compilation errors
Adding strings from slide
Merge branch 'master' of github.com:idega/is.idega.idegaweb.egov.accounting into BRANCH_PLATFORM_5