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

Conflicts:
	SocialPlaZa/Model.js
	SocialPlaZa/Model.waModel
	SocialPlaZa/WebFolder/scripts/login.js