script tabs
plantilla tabs creada
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/plantillaGlobal.html