Merge origin/master

Conflicts:
	connection/connection.php
	dao/reclamation_dao.php
Merge origin/master
Merge origin/master

Conflicts:
	connection/connection.php
	dao/reclamation_dao.php