commit 13/01

Bug d'affichage
Merge branch 'master' of https://github.com/Xaleis/RPG

Conflicts:
	web-static/js/Character.js
	web-static/js/Player.js
	web-static/js/Sprite.js