Update #383
Update #385
Update #386
Merge branch 'master' of https://github.com/franak/SocialPlaZa

Conflicts:
	SocialPlaZa/WebFolder/components/ds/TPV.waComponent/TPV.css
tpv