asset modif
Merge branch 'master' of http://www.ecole.ensicaen.fr/~chamoux/img-intensif/projet-intensif-image-2015

Conflicts:
	AssetManager.js