Merge origin/master

Conflicts:
	dao/Geolocalisation_DAO.php
	parsing/reclamation_xmlparser.php
	utilisateurs.php
Merge origin/master

Conflicts:
	tunisianwatchme/nbproject/project.properties
Merge origin/master

Conflicts:
	tunisianwatchme/nbproject/project.properties
Merge origin/master
Merge origin/master

Conflicts:
	tunisianwatchme/nbproject/project.properties
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	tunisianwatchme/nbproject/project.properties
Merge origin/master

Conflicts:
	tunisianwatchme/nbproject/project.properties
Merge origin/master

Conflicts:
	tunisianwatchme/src/com/tunisianwatchme/Gui/Midlet.java
Merge origin/master

Conflicts:
	tunisianwatchme/src/com/tunisianwatchme/Gui/Midlet.java
Merge origin/master

Conflicts:
	tunisianwatchme/src/com/tunisianwatchme/Gui/Midlet.java