Add Canon Prefab
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Standard Assets/Water (Basic)/Sources/Materials/Daylight Simple
Water.mat