Fixing art in 1.1.4;
Merge branch 'master' of https://github.com/ifdm/siphon

Conflicts:
	Assets/Graphics/Art/spikes/spikes4-1000x1000.png.meta
Merge branch 'master' of https://github.com/ifdm/siphon

Conflicts:
	Assets/Graphics/Art/spikes/spikes4-1000x1000.png.meta