Wakanda 5
Merge branch 'master' of https://github.com/franak/SocialPlaZa

Conflicts:

SocialPlaZa/WebFolder/components/commons/menulateral.waComponent/menulat
eral.js
	SocialPlaZa/WebFolder/components/ds/TPV.waComponent/TPV.css
	SocialPlaZa/WebFolder/components/ds/TPV.waComponent/TPV.html
	SocialPlaZa/WebFolder/components/ds/TPV.waComponent/TPV.js
	SocialPlaZa/WebFolder/main.html