cameamea
Merge branch 'master' of https://github.com/daboooo/BigBrother

Conflicts:
	src/main/java/org/ia54Project/organization/RoleControlManager.java
	src/main/java/org/ia54Project/organization/RoleGUIManager.java
	src/main/java/org/ia54Project/organization/RoleManager.java
	src/main/java/org/janusproject/kernel/network/jxse/agent/MonitoredKernelAgent.java