Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/Assets/Scenes/Endless.unity
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 54c49038a4cc21abb1ebc371547a720006e46ed4.