Finished art updates and raycasted the world.
Merge remote-tracking branch 'origin/master'

Conflicts:
	AwesomeProject/AwesomeProject.userprefs