Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	src/com/tunisianwatch/Gui/AcceuilPanel.java
	src/com/tunisianwatch/Gui/ConsultationPanel.java
	src/com/tunisianwatch/Gui/Statistique.form
	src/com/tunisianwatch/Main/Main.java
Merge origin/master

Conflicts:
	src/com/tunisianwatch/Gui/AcceuilPanel.java