Removed needless config
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
  Removed needless config
Ignoring bin and classpath
Merge branch 'master' of github.com:idega/com.idega.block.school into course_test

* 'master' of github.com:idega/com.idega.block.school:
  Ignoring bin and classpath

Conflicts:
	.gitignore
Merge branch 'course_test' of github.com:idega/com.idega.block.school into course_test

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