updates to the living room maps
Merge branch 'master' of https://github.com/Anniepoo/DSalleShare

Conflicts:
	TDV/TDV.suo
	TDV/XnaBasics/bin/x86/Debug/XnaBasics.exe
	TDV/XnaBasics/bin/x86/Debug/XnaBasics.pdb
	TDV/XnaBasics/obj/x86/Debug/TDV.csproj.FileListAbsolute.txt
	TDV/XnaBasics/obj/x86/Debug/XnaBasics.exe
	TDV/XnaBasics/obj/x86/Debug/XnaBasics.pdb
	TDV/XnaBasics/obj/x86/Debug/cachefile-{EDD1E44F-7A6A-4EEF-81BA-C2AE70414025}-targetpath.txt
	TDV/XnaBasicsContent/FrontField.png
	TDV/XnaBasicsContent/FrontMidField.png
	TDV/XnaBasicsContent/MidField.png
	TDV/XnaBasicsContent/obj/x86/Debug/ContentPipeline.xml
nothing really
Merge branch 'master' of https://github.com/Anniepoo/DSalleShare

Conflicts:
	TDV/XnaBasics/CartoonElements.cs
added new method to PlayerImageRenderer and made game 1280 x 960 to fix the coordinate problem with the masking
minor change took out a comment