ok
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop

Conflicts:
	Assets/Depth Mask Example/Meshes/Materials/Water.mat
Tinkering with Scenes. Created RingBreaker prefab
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop

Conflicts:
	Assets/Scenes/prototype.unity
no message
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop
......
Merge branch 'feature/Prototype' into develop
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop

Conflicts:
	Assets/Scenes/prototype.unity
	Assets/Scripts/PartnerLink.cs
Unity 5 forced renderer property to change to a GetComponent call.
Fixed some numbers in editor and allowed fluffs to not spawn if spawn time is less than zero.
Grab fluff if it is moving.
Merge because unity
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop

Conflicts:
	Assets/Scripts/Objects/Trigger.cs
Temporary commit with fluff generator
Fixed fluff generator. Now uses angles with a random velocity.
Added a simple sound to the puff prefab, but it's more of a placeholder until we can make or find something better.
Spawning fluffs to populate least dense areas. Totally deterministic and fails when moving.
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop