Minor fixes

Minor stuff. Cleanup.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Leashed/Leashed/LeashedContent/obj/x86/Debug/ContentPipeline.xml
Merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	Leashed/Leashed/LeashedContent/obj/x86/Debug/ContentPipeline.xml
Merge branch 'master' of https://github.com/Delmator/Unleashed_2014