check conflict single&repeatable
Merge remote-tracking branch 'origin/master'

Conflicts:
	Meetingroom/Entity/AbstractEntity.php