video changed
Merge branch 'master' of github.com:ncc-unesp/goo-server

Conflicts:
	portal/home.html