Some GenreDaoTests added.
Merge origin/master

Conflicts:
	derby.log