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

Conflicts:
	SocialPlaZa/WebFolder/components/commons/header.waComponent/header.css
	SocialPlaZa/WebFolder/components/commons/header.waComponent/header.html