posType is now pos_t
Merge branch 'master' of github.com:niive12/CupCollector

Conflicts:
	code/cupcollector/scanner/scanner.cpp
	code/cupcollector/scanner/scanner.h
Merge branch 'master' of github.com:niive12/CupCollector