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

Conflicts:
	SocialPlaZa/WebFolder/login.html
	SocialPlaZa/WebFolder/styles/index.css
Update #367
??