Removed needless config
Using generics
Ignoring bin and classpath
Avoiding NPE
Adding parent school column
Merge branch 'master' of github.com:idega/com.idega.block.school
Merge branch 'master' of github.com:idega/com.idega.block.school into BRANCH_PLATFORM_5

Conflicts:
	pom.xml
Using generics
Merge branch 'master' of github.com:idega/com.idega.block.school into BRANCH_PLATFORM_5