Signed-off-by: thami78 <inaflas.thami@gmail.com>
Merge branch 'master' of https://github.com/Nikkidbz/MAS

Conflicts:
	client/src/java/CommAssistantGUI.java
	client/src/java/CommAssistantGUIWrapper.java