Fixed Bugs
Merge remote-tracking branch 'origin/jamesProgramming' into development

Conflicts:
	SparkleLeaf/Library/shadercompiler-1.log
	SparkleLeaf/SparkleLeaf-csharp.sln
	SparkleLeaf/SparkleLeaf.sln