Update rooms and users in gui
Merge branch 'master' of https://github.com/pcfascinated/Chatrix.git

Conflicts:
	Chatrix/src/client/Room.java