bzdurny commit przed pullem
Merge branch 'master' of github.com:mrkaczor/VHostDetector

Conflicts:
	src/research/c/ResearchService.java
Merge branch 'master' of github.com:mrkaczor/VHostDetector

Conflicts:
	src/core/c/Main.java
	src/research/c/ResearchService.java