Adding the latest bug fixes
Merge branch 'master' of https://github.com/basisworldwide/SumTV

	modified:   app/models/video.rb