Merged WirelessPublisher into youbot-rvo branch
Added *.orig files from mergetool to gitignore
Fixed merge issues with WirelessPublisher branch, minor changes in Circle