-Paintings
-MuzzleFlash
-ShotgunParticle
-UniverseDisplay
Merge branch 'master' of https://github.com/CptDefault/ggj2014

Conflicts:
	Unity/Assets/Meshes/Materials.meta
UpdatedEffects prefabs
no message
Merge branch 'master' into WinstonBranch