Conflicts: src/main/java/info/bukova/isspst/services/requirement/TripRequirementService.java src/main/java/info/bukova/isspst/services/requirement/TripRequirementServiceImpl.java src/main/java/info/bukova/isspst/ui/requirement/TripRequirementForm.java src/main/webapp/WEB-INF/locales/zk-label.properties