Link to video stream
Merge branch 'master' of https://github.com/scalableinternetservices/Upvid

Conflicts:
	config/routes.rb