Set up collisions in Unity
Merge branch 'master' of https://github.com/jaycaz/Nimbus

Conflicts:
	Assets/Standard Assets/Particles/Sources/Materials/Smoke.mat
	Assets/scene.unity