FX and ui updates
Merge branch 'master' of github.com:gdeglin/BubbleGame

Conflicts:
	Assets/Ferr/2DTerrain/Examples/Assets/Materials/MossyEdges.mat
	Assets/Main.unity
	Assets/Resources/Meshes/Env.New Terrain-Mesh.asset