Merge origin/master

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

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

Conflicts:
	nbproject/project.properties