modif gos et index
Merge branch 'master' of https://github.com/Warrows/projet-intensif-image-2015

Conflicts:
	index.html
maj GoverS
GOverS edit
Ajout LoadScreen et AssetManager
Merge branch 'master' of http://www.ecole.ensicaen.fr/~matteucci/public_vico/projet-intensif-image-2015

Conflicts:
	index.html
Moved scripts in index
ajout du dossier img avec l'image de gameover
Debut loadscreen
Merge branch 'master' of https://github.com/obodrel/projet-intensif-image-2015

Conflicts:
	index.html
Merge branch 'master' of http://www.ecole.ensicaen.fr/~matteucci/public_vico/projet-intensif-image-2015
update entities