Update #46
Merge branch 'master' of https://github.com/franak/SocialPlaZa

Conflicts:
	SocialPlaZa/WebFolder/application.css
	SocialPlaZa/WebFolder/components/ds/TPV.waComponent/TPV.html
	SocialPlaZa/WebFolder/styles/serp.css