commit by marwen
commit by marwen
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/com/tunisianwatch/Gui/ReclamationForm.java
Merge branch 'master' of https://github.com/deadlinemonotonic/tunisianwatchphp.git
Merge origin/master

Conflicts:
	nbproject/project.properties
commit by marwen
commit by marwen
Merge marwensdiri/master
Merge origin/master

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

Conflicts:
	nbproject/project.properties
Merge origin/master

Conflicts:
	tunisianwatchphp/connection/connection.php
Merge origin/master

Conflicts:
	nbproject/project.properties
Merge origin/master

Conflicts:
	entity/GeolocalistionEntity.php