USB capture support
Merge branch 'master' of github.com:SquadCollaborativeRobotics/april_tags

Conflicts:
	launch/april_tags.launch