img update
door image
Merge remote-tracking branch 'origin/master' into Stab

Conflicts:
	LD26/LD26/LD26.csproj.Debug.cachefile
	LD26/LD26Content/LD26Content.contentproj
	LD26/LD26Content/Objects/doorCIRCLE.xml
	LD26/LD26Content/Objects/doorCIRCLEImg.png
	LD26/LD26Content/Test/Cursor.xml
	LD26/LD26Content/Test/Map.xml
	LD26/LD26Content/Test/map02.tmx
fix merge
fix merge
fix gfx portes
Merge branch 'Stab'