commit prior to Diana pull
Merge branch 'master' of https://github.com/Anniepoo/DSalleShare

Conflicts:
	TDV/TDV.suo
	TDV/XnaBasics/SkeletonStreamRenderer.cs