modif PUT
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
	webService.php
modif PUT-20-12-2014