video show view done
Merge branch 'hc_videoshow' of https://github.com/hcaiano/sv_mentor

Conflicts:
	Gemfile.lock