test for CategoryDao, implemented findAll in categoryDaoImpl
	# Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/jirikrepl/PA165-Manager-LEGO-stavebnic
Merge branch 'master' of https://github.com/jirikrepl/PA165-Manager-LEGO-stavebnic
Merge branch 'master' of https://github.com/jirikrepl/PA165-Manager-LEGO-stavebnic

Conflicts:
	src/test/java/cz/muni/fi/PA165/TestUtils.java
ThemeSet test update
ThemeSetDAO interface update
tests for CategoryDao
	Merge branch 'master' of https://github.com/jirikrepl/PA165-Manager-LEGO-stavebnic
	new
	# Please enter the commit message for your changes. Lines starting
	# with '#' will be ignored, and an empty message aborts the commit.
	#
	# Committer: Martin Rumanek <rumanekm@localhost.localdomain>
	#
	# On branch master
	# Changes to be committed:
	#   (use "git reset HEAD <file>..." to unstage)
	#
	#	new file:   src/test/java/cz/muni/fi/PA165/dao/CategoryDaoTest.java
	#
BrickDaoTest
ThemeSetDaoTest
Merge branch 'master' of https://github.com/jirikrepl/PA165-Manager-LEGO-stavebnic
tests completed
aafasdf
refactoring
cleasing code
Merge branch 'master' of https://github.com/jirikrepl/PA165-Manager-LEGO-stavebnic

Conflicts:
	src/main/java/cz/muni/fi/PA165/MyBrickTest.java
oprava testu
>
refactoring, fixing bugs
Merge remote-tracking branch 'origin/master'