Zmiana testowania siadania
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/to2/dice/controllers/common/RoomController.java
Zmiana testowania siadania