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

Conflicts:
	SocialPlaZa/WebFolder/components/commons/header.waComponent/header.css
	SocialPlaZa/WebFolder/main.html
	SocialPlaZa/WebFolder/styles/index.css
	SocialPlaZa/WebFolder/styles/serp.css
Merge branch 'master' of https://github.com/franak/SocialPlaZa