fc
fc
Merge branch 'master' of https://github.com/franak/SocialPlaZa

Conflicts:
	SocialPlaZa/Backups/lastBackup.json
	SocialPlaZa/DataFolder/data.waExtra
	SocialPlaZa/DataFolder/journal.waJournal
	SocialPlaZa/Model.waModel
model