adding hashcodes and equals
Merge remote-tracking branch 'origin/master'

Conflicts:
	DnDTroopsProject/derby.log

	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