Jul 25 - Ven no valida
Merge branch 'master' of https://github.com/xennma/liveonstage

Conflicts:
	Resources/alloy/controllers/feed.js
	app/controllers/viewVideo.js