I dont know what
Merge remote-tracking branch 'origin/master'

Conflicts:

	DnDTroopsProject/src/test/java/cz/fi/muni/pa165/test/MissionDAOTest.java
Revert "I dont know what"

This reverts commit 77eda452280786964f8b5b49e3cefe33b66864c1.