Merge pull request #45 from mbathletes/dylan

Dylan
Added video update forms
Merge pull request #46 from mbathletes/orlandov

Added video update forms
fixed bugs and views
fixed conflicts