Added lots of new stuff for CombineChildren
Merge branch 'alex' of https://github.com/AlexHayton/UnityTestProject2 into alex

Conflicts:
	Assets/TestProject/Scripts/World.meta