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
Testing dandelion visuals.
Merge branch 'develop' into feature/dandelion

Conflicts:
	Assets/Prefabs/Pulse.prefab
Able to exchange fluffs.
......
Merge branch 'feature/Prototype' 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
Spawning fluffs and passing a group.
Merge branch 'feature/dandelion' into develop
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