commit by marwen
Merge marwensdiri/master
commit by marwen
commit by marwen
commit by marwen
commit by marwen
commit by marwen
commit by marwen
Merge marwensdiri/master

Conflicts:
	src/com/tunisianwatch/Gui/ConsultationPanel.form
	src/com/tunisianwatch/Gui/ConsultationPanel.java