Update #374
Elimino la ristra de banderas
Merge branch 'master' of https://github.com/SocialERPTelegestion/FeelTeam.com

Conflicts:

FeelTeam/WebFolder/components/Administracion/Articulos.waComponent/Artic
ulos.css
	FeelTeam/WebFolder/components/ds/TPV.waComponent/TPV.html
	FeelTeam/WebFolder/components/ds/TPV.waComponent/TPV.js
	FeelTeam/WebFolder/index.html