boostlib
Merge branch 'master' of https://github.com/flashbac/esd_projekt

Conflicts:
	server/opencv/src/main.cpp