Change maximum number of participant is done
Fixing merge

Merge https://github.com/HamidM250/S-Ware

Conflicts:
	log/development.log