re-added webcam watermark on raspi.
added resizing to osx.
Merge branch 'v0.3-dev' of github.com:Hoektronics/BotQueue into v0.3-dev