local1
Merge branch 'master' of https://github.com/xccvista/VideoProject

Conflicts:
	templates/widget.html
add widget base