Merge pull request #1 from OssianL/master

testipalikat
World generation stuff. Not tested much due not having time to create prefabs.
Merge to pull request for commits: e78e8e97d4e43ff69a8d3c2558572e614deb7a71 and d994c274caa80514bbc16ba48f840eda6bfcfd7d
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Assembly-CSharp.pidb
	Assets/test.unity