ajout de l'interface "actions pertinantes" du scoring coté prof
fixed the gitignore to ignore moc files
Merge branch 'master' of https://github.com/SNOTRAProject/snotra

Conflicts:
	SNOTRA/WireShark.cpp
	SNOTRA/moc_Charger.cpp
	SNOTRA/moc_Confirmation.cpp
	SNOTRA/moc_RelevantActions.cpp
	SNOTRA/moc_Sauvegarder.cpp
	SNOTRA/nbproject/qt-Debug.pro
	SNOTRA/nbproject/qt-Release.pro
	SNOTRA/qrc_IconeItemNetwork.cpp
	SNOTRA/ui_Charger.h
	SNOTRA/ui_Confirmation.h
	SNOTRA/ui_Game.h
	SNOTRA/ui_NetworkGameArea.h
	SNOTRA/ui_PortConnecterChoice.h
	SNOTRA/ui_RelevantActions.h
	SNOTRA/ui_Sauvegarder.h
	SNOTRA/ui_ToolBox.h
	SNOTRA/ui_WireShark.h