Fix Resolution
Merge branch 'qrcode' of github.com:corobotics/corobots into qrcode

Conflicts:
	corobot_qrcode/src/barcodepublisher.cpp