.
Merge branch 'master' of https://github.com/Baekalfen/ICAP-avscan

Conflicts:
	C-Sharp/ICAP/ICAP.cs