Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/tunisianwatch/Gui/ReclamationForm.java
Merge origin/master
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/tunisianwatch/Gui/ReclamationForm.java