Using generics
Merge branch 'master' of github.com:idega/com.idega.block.school into course_test

* 'master' of github.com:idega/com.idega.block.school:
  Using generics

Conflicts:
	src/java/com/idega/block/school/business/SchoolBusinessBean.java
	src/java/com/idega/block/school/data/School.java
	src/java/com/idega/block/school/data/SchoolCategoryHome.java
	src/java/com/idega/block/school/data/SchoolUserHome.java
Merging
Bug fixes