arreglao

Creo package.json
Merge branch 'master' of https://github.com/SocialERPTelegestion/SocialPlaZa

Conflicts:

SocialPlaZa/WebFolder/components/Administracion/Articulos.waComponent/Ar
ticulos.package.json
	SocialPlaZa/WebFolder/desktop.core.min.css
	SocialPlaZa/WebFolder/desktop.core.min.js
	SocialPlaZa/WebFolder/dsPrueba.waPage/index.html
	SocialPlaZa/WebFolder/main.html
	SocialPlaZa/WebFolder/main.package.json
	SocialPlaZa/WebFolder/mobile.core.min.css
	SocialPlaZa/WebFolder/mobile.core.min.js