Update Form Hardare
Merge branch 'master' of https://github.com/monsieurp74/Gamesite

Conflicts:
	composer.json