Fix update script (sql errors)
Coding standard: Type NoSpaceAfterComma
Coding standard: Type NoSpaceAfterComma
Fix php error
Coding standard: Type TooLong
Merge branch 'master' into master+deploy-migration

Conflicts:
	fusioninventory/hook.php
Merge branch 'master+deploy-migration' of github.com:fusinv/fusioninventory-for-glpi into master+deploy-migration