refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	DnDTroopsProject/derby.log
	DnDTroopsProject/target/DnDTroopsProject-1.0-SNAPSHOT.jar
	DnDTroopsProject/target/classes/cz/fi/muni/pa165/dao/HeroDAO.class
	DnDTroopsProject/target/classes/cz/fi/muni/pa165/dao/MissionDAO.class
	DnDTroopsProject/target/classes/cz/fi/muni/pa165/dao/RoleDAO.class
	DnDTroopsProject/target/classes/cz/fi/muni/pa165/dao/TroopDAO.class

	DnDTroopsProject/target/classes/cz/fi/muni/pa165/daoImpl/HeroDAOImpl.class

	DnDTroopsProject/target/classes/cz/fi/muni/pa165/daoImpl/MissionDAOImpl.class

	DnDTroopsProject/target/classes/cz/fi/muni/pa165/daoImpl/RoleDAOImpl.class

	DnDTroopsProject/target/classes/cz/fi/muni/pa165/daoImpl/TroopDAOImpl.class
	DnDTroopsProject/target/classes/cz/fi/muni/pa165/entity/Hero.class
	DnDTroopsProject/target/classes/cz/fi/muni/pa165/entity/Mission.class
	DnDTroopsProject/target/classes/cz/fi/muni/pa165/entity/Race.class
	DnDTroopsProject/target/classes/cz/fi/muni/pa165/entity/Role.class
	DnDTroopsProject/target/classes/cz/fi/muni/pa165/entity/Troop.class

	DnDTroopsProject/target/surefire-reports/TEST-cz.fi.muni.pa165.testDAO.HeroDAOTest.xml

	DnDTroopsProject/target/surefire-reports/TEST-cz.fi.muni.pa165.testDAO.MissionDAOTest.xml

	DnDTroopsProject/target/surefire-reports/TEST-cz.fi.muni.pa165.testDAO.RoleDAOTest.xml

	DnDTroopsProject/target/surefire-reports/TEST-cz.fi.muni.pa165.testDAO.TroopDAOTest.xml

	DnDTroopsProject/target/surefire-reports/cz.fi.muni.pa165.testDAO.HeroDAOTest.txt

	DnDTroopsProject/target/surefire-reports/cz.fi.muni.pa165.testDAO.MissionDAOTest.txt

	DnDTroopsProject/target/surefire-reports/cz.fi.muni.pa165.testDAO.RoleDAOTest.txt

	DnDTroopsProject/target/surefire-reports/cz.fi.muni.pa165.testDAO.TroopDAOTest.txt

	DnDTroopsProject/target/test-classes/cz/fi/muni/pa165/testDAO/MissionDAOTest.class