Merge marwensdiri/master

Conflicts:
	src/com/tunisianwatch/Gui/ConsultationPanel.form
	src/com/tunisianwatch/Gui/ConsultationPanel.java
Merge marwensdiri/master

Conflicts:
	src/com/tunisianwatch/Gui/ConsultationPanel.form
	src/com/tunisianwatch/Gui/ConsultationPanel.java
Merge marwensdiri/master

Conflicts:
	src/com/tunisianwatch/Gui/ConsultationPanel.form
	src/com/tunisianwatch/Gui/ConsultationPanel.java
commit  marwensdiri/master
malla jaw
malla jaw
enfin  :))