merged
Merge branch 'master' of git://github.com/auv-avalon/bundle
Merge branch 'master' of git://github.com/auv-avalon/bundle
Removed raw reader because he is buggy
Video streamer is working!
Merge 192.168.128.51:testing/bundles/avalon

Conflicts:
	scripts/controllers/auto_starter.rb