Added annotations to objects, spring, hiber. conf. files
Added DAO and impl
Fixed small bugs
Added test resources and GenericTest
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/pom.xml