Merge origin/master

Conflicts:
	src/com/tunisianwatch/Gui/AcceuilPanel.java
	src/com/tunisianwatch/Gui/StatistiquePanel.form
	src/com/tunisianwatch/Gui/StatistiquePanel.java
Merge origin/master

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

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

Conflicts:
	src/com/tunisianwatch/Gui/ProfilPanel.form
	src/com/tunisianwatch/Gui/ProfilPanel.java
Merge origin/master

Conflicts:
	src/com/tunisianwatch/Gui/ProfilPanel.form
	src/com/tunisianwatch/Gui/ProfilPanel.java
Merge origin/master

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