avtualizacion
Merge branch 'master' of https://github.com/estrategasdigitales/caterpie

Conflicts:
	js/video_editor.js