last update
Merge remote-tracking branch 'origin/master'

Conflicts:

	DnDTroops-service/src/main/resources/META-INF/applicationContext-service.xml
	DnDTroops-web/src/main/webapp/WEB-INF/applicationContext-web.xml

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