Types instead of areas
Merge branch 'course_test' of github.com:idega/is.idega.idegaweb.egov.accounting into course_test

* 'course_test' of github.com:idega/is.idega.idegaweb.egov.accounting:
  Bug fix

Conflicts:
	src/java/is/idega/idegaweb/egov/accounting/presentation/SchoolCodeEditor.java